diff options
| -rw-r--r-- | GL/glx/glxscreens.c | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | hw/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/vfb/InitOutput.c | 2 | ||||
| -rw-r--r-- | hw/xnest/Init.c | 2 | ||||
| -rw-r--r-- | hw/xprint/attributes.c | 2 | ||||
| -rw-r--r-- | hw/xprint/ddxInit.c | 2 | ||||
| -rw-r--r-- | include/cursor.h | 2 | ||||
| -rw-r--r-- | include/dixfont.h | 2 | ||||
| -rw-r--r-- | include/resource.h | 2 | ||||
| -rw-r--r-- | include/window.h | 4 | ||||
| -rw-r--r-- | miext/rootless/rootlessConfig.h | 4 |
12 files changed, 15 insertions, 15 deletions
diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c index d6002532d..d57b3a912 100644 --- a/GL/glx/glxscreens.c +++ b/GL/glx/glxscreens.c @@ -174,7 +174,7 @@ static char GLXServerExtensions[] = "GLX_EXT_texture_from_pixmap " "GLX_OML_swap_method " "GLX_SGI_make_current_read " -#ifndef __DARWIN__ +#ifndef __APPLE__ "GLX_SGIS_multisample " "GLX_SGIX_hyperpipe " "GLX_SGIX_swap_barrier " diff --git a/configure.ac b/configure.ac index d30d3c402..5a507afbe 100644 --- a/configure.ac +++ b/configure.ac @@ -1712,7 +1712,7 @@ if test "x$XQUARTZ" = xyes; then AC_SUBST([DARWIN_LIBS]) AC_CHECK_LIB([Xplugin],[xp_init],[:]) AC_SUBST([APPLE_APPLICATIONS_DIR]) - CFLAGS="${CFLAGS} -D__DARWIN__ -DROOTLESS_WORKAROUND -DNO_ALLOCA" + CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DNO_ALLOCA" PLIST_VERSION_STRING=$PACKAGE_VERSION AC_SUBST([PLIST_VERSION_STRING]) PLIST_VENDOR_WEB=$VENDOR_WEB diff --git a/hw/Makefile.am b/hw/Makefile.am index abdeabb01..c2b9571b9 100644 --- a/hw/Makefile.am +++ b/hw/Makefile.am @@ -38,11 +38,11 @@ SUBDIRS = \ $(XORG_SUBDIRS) \ $(XGL_SUBDIRS) \ $(XWIN_SUBDIRS) \ - $(XQUARTZ_SUBDIRS) \ $(XVFB_SUBDIRS) \ $(XNEST_SUBDIRS) \ - $(DMX_SUBDIRS) \ + $(DMX_SUBDIRS) \ $(KDRIVE_SUBDIRS) \ + $(XQUARTZ_SUBDIRS) \ $(XPRINT_SUBDIRS) DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index 0d4ca57fe..a00f7a5bb 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -220,7 +220,7 @@ AbortDDX() ddxGiveUp(); } -#ifdef __DARWIN__ +#ifdef __APPLE__ void DarwinHandleGUI(int argc, char *argv[]) { diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index 4699111b9..d1fd75732 100644 --- a/hw/xnest/Init.c +++ b/hw/xnest/Init.c @@ -124,7 +124,7 @@ void ddxGiveUp() AbortDDX(); } -#ifdef __DARWIN__ +#ifdef __APPLE__ void DarwinHandleGUI(int argc, char *argv[]) { diff --git a/hw/xprint/attributes.c b/hw/xprint/attributes.c index d8ee5adf8..4c6ad46a9 100644 --- a/hw/xprint/attributes.c +++ b/hw/xprint/attributes.c @@ -1378,7 +1378,7 @@ ReplaceAllKeywords( defined(ISC) || \ defined(Lynx) || \ defined(__QNX__) || \ - defined(__DARWIN__) + defined(__APPLE__) #define iswspace(c) (isascii(c) && isspace(toascii(c))) #endif diff --git a/hw/xprint/ddxInit.c b/hw/xprint/ddxInit.c index 1e7652e60..d744121aa 100644 --- a/hw/xprint/ddxInit.c +++ b/hw/xprint/ddxInit.c @@ -205,7 +205,7 @@ ProcessInputEvents(void) { } -#ifdef __DARWIN__ +#ifdef __APPLE__ #include "micmap.h" void GlxExtensionInit(void); diff --git a/include/cursor.h b/include/cursor.h index bdf4fd301..dc0810cd1 100644 --- a/include/cursor.h +++ b/include/cursor.h @@ -70,7 +70,7 @@ extern int FreeCursor( /* Quartz support on Mac OS X pulls in the QuickDraw framework whose AllocCursor function conflicts here. */ -#ifdef __DARWIN__ +#ifdef __APPLE__ #define AllocCursor Darwin_X_AllocCursor #endif extern CursorPtr AllocCursor( diff --git a/include/dixfont.h b/include/dixfont.h index 709da6272..d6d13b40a 100644 --- a/include/dixfont.h +++ b/include/dixfont.h @@ -118,7 +118,7 @@ extern void DeleteClientFontStuff(ClientPtr /*client*/); /* Quartz support on Mac OS X pulls in the QuickDraw framework whose InitFonts function conflicts here. */ -#ifdef __DARWIN__ +#ifdef __APPLE__ #define InitFonts Darwin_X_InitFonts #endif extern void InitFonts(void); diff --git a/include/resource.h b/include/resource.h index 3231e8cd9..6c0d5dc7f 100644 --- a/include/resource.h +++ b/include/resource.h @@ -153,7 +153,7 @@ extern XID FakeClientID( /* Quartz support on Mac OS X uses the CarbonCore framework whose AddResource function conflicts here. */ -#ifdef __DARWIN__ +#ifdef __APPLE__ #define AddResource Darwin_X_AddResource #endif extern Bool AddResource( diff --git a/include/window.h b/include/window.h index 312b75e88..58e2c49b5 100644 --- a/include/window.h +++ b/include/window.h @@ -125,7 +125,7 @@ extern void DestroySubwindows( /* Quartz support on Mac OS X uses the HIToolbox framework whose ChangeWindowAttributes function conflicts here. */ -#ifdef __DARWIN__ +#ifdef __APPLE__ #define ChangeWindowAttributes Darwin_X_ChangeWindowAttributes #endif extern int ChangeWindowAttributes( @@ -136,7 +136,7 @@ extern int ChangeWindowAttributes( /* Quartz support on Mac OS X uses the HIToolbox framework whose GetWindowAttributes function conflicts here. */ -#ifdef __DARWIN__ +#ifdef __APPLE__ #define GetWindowAttributes(w,c,x) Darwin_X_GetWindowAttributes(w,c,x) extern void Darwin_X_GetWindowAttributes( #else diff --git a/miext/rootless/rootlessConfig.h b/miext/rootless/rootlessConfig.h index 3e326bf06..ab0187e83 100644 --- a/miext/rootless/rootlessConfig.h +++ b/miext/rootless/rootlessConfig.h @@ -34,7 +34,7 @@ #ifndef _ROOTLESSCONFIG_H #define _ROOTLESSCONFIG_H -#ifdef __DARWIN__ +#ifdef __APPLE__ # define ROOTLESS_ACCEL TRUE # define ROOTLESS_GLOBAL_COORDS TRUE @@ -48,7 +48,7 @@ alpha for 16bpp. */ # define RootlessAlphaMask(bpp) ((bpp) == 32 ? 0xFF000000 : 0) -#endif /* __DARWIN__ */ +#endif /* __APPLE__ */ #if defined(__CYGWIN__) || defined(WIN32) |