diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-22 10:29:25 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-22 10:29:25 +0000 |
| commit | ac80633ce275edddaa3e4fa2ae0c048ed00f7d74 (patch) | |
| tree | 7d4ceffed59f2782533d3485c075f605ab1b9c61 /xorg-server/hw/xquartz/GL | |
| parent | 6fc6cb8c935fab174e4582909c1cb4f12bd598bf (diff) | |
| download | vcxsrv-ac80633ce275edddaa3e4fa2ae0c048ed00f7d74.tar.gz vcxsrv-ac80633ce275edddaa3e4fa2ae0c048ed00f7d74.tar.bz2 vcxsrv-ac80633ce275edddaa3e4fa2ae0c048ed00f7d74.zip | |
svn merge -c505 ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/GL')
| -rw-r--r-- | xorg-server/hw/xquartz/GL/Makefile.am | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xquartz/GL/Makefile.in | 5 | ||||
| -rw-r--r-- | xorg-server/hw/xquartz/GL/capabilities.c | 4 | ||||
| -rw-r--r-- | xorg-server/hw/xquartz/GL/indirect.c | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/xorg-server/hw/xquartz/GL/Makefile.am b/xorg-server/hw/xquartz/GL/Makefile.am index 9b61305d6..af890776e 100644 --- a/xorg-server/hw/xquartz/GL/Makefile.am +++ b/xorg-server/hw/xquartz/GL/Makefile.am @@ -1,5 +1,5 @@ noinst_LTLIBRARIES = libCGLCore.la -AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/glx \ diff --git a/xorg-server/hw/xquartz/GL/Makefile.in b/xorg-server/hw/xquartz/GL/Makefile.in index 9fd961d42..df3c91eae 100644 --- a/xorg-server/hw/xquartz/GL/Makefile.in +++ b/xorg-server/hw/xquartz/GL/Makefile.in @@ -125,6 +125,7 @@ DARWIN_LIBS = @DARWIN_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_LIBS = @DBUS_LIBS@ DEFAULT_LIBRARY_PATH = @DEFAULT_LIBRARY_PATH@ +DEFAULT_LOGDIR = @DEFAULT_LOGDIR@ DEFAULT_LOGPREFIX = @DEFAULT_LOGPREFIX@ DEFAULT_MODULE_PATH = @DEFAULT_MODULE_PATH@ DEFS = @DEFS@ @@ -256,6 +257,8 @@ RANLIB = @RANLIB@ RAWCPP = @RAWCPP@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ +SELINUX_CFLAGS = @SELINUX_CFLAGS@ +SELINUX_LIBS = @SELINUX_LIBS@ SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@ SET_MAKE = @SET_MAKE@ SHA1_CFLAGS = @SHA1_CFLAGS@ @@ -393,7 +396,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libCGLCore.la -AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/glx \ diff --git a/xorg-server/hw/xquartz/GL/capabilities.c b/xorg-server/hw/xquartz/GL/capabilities.c index 5f1f87013..2c5ec658c 100644 --- a/xorg-server/hw/xquartz/GL/capabilities.c +++ b/xorg-server/hw/xquartz/GL/capabilities.c @@ -31,6 +31,10 @@ #include "capabilities.h" +#define Cursor X_Cursor +#include "os.h" +#undef Cursor + static void handleBufferModes(struct glCapabilitiesConfig *c, GLint bufferModes) { if(bufferModes & kCGLStereoscopicBit) { c->stereo = true; diff --git a/xorg-server/hw/xquartz/GL/indirect.c b/xorg-server/hw/xquartz/GL/indirect.c index 44380ffa0..c092c1d17 100644 --- a/xorg-server/hw/xquartz/GL/indirect.c +++ b/xorg-server/hw/xquartz/GL/indirect.c @@ -471,7 +471,7 @@ static int __glXAquaContextForceCurrent(__GLXcontext *baseContext) } /* Drawing surface notification callbacks */ -static GLboolean __glXAquaDrawableSwapBuffers(__GLXdrawable *base) { +static GLboolean __glXAquaDrawableSwapBuffers(ClientPtr client, __GLXdrawable *base) { CGLError err; __GLXAquaDrawable *drawable; |