xserver: Branch 'xorg-server-1.2-apple'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Fri Dec 7 18:53:20 PST 2007
GL/glx/glxscreens.c | 2 +-
configure.ac | 2 +-
hw/Makefile.am | 8 ++++----
hw/vfb/InitOutput.c | 2 +-
hw/xnest/Init.c | 2 +-
hw/xprint/attributes.c | 2 +-
hw/xprint/ddxInit.c | 2 +-
include/cursor.h | 2 +-
include/dixfont.h | 2 +-
include/resource.h | 2 +-
include/window.h | 4 ++--
miext/rootless/rootlessConfig.h | 4 ++--
12 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 54654815fa5e59b25cfd1fa72610120b72c10175
Author: Jeremy Huddleston <jeremy at dhcp-38-248.EECS.Berkeley.EDU>
Date: Fri Dec 7 18:53:08 2007 -0800
Darwin: Use __APPLE__ instead of __DARWIN__
diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c
index 43447a4..a2d14d5 100644
--- a/GL/glx/glxscreens.c
+++ b/GL/glx/glxscreens.c
@@ -170,7 +170,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 2182415..c6e132b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1649,7 +1649,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 753d6a9..d3a3571 100644
--- a/hw/Makefile.am
+++ b/hw/Makefile.am
@@ -23,7 +23,7 @@ XPRINT_SUBDIRS = xprint
endif
if XQUARTZ
-DARWIN_SUBDIRS = xquartz
+XQUARTZ_SUBDIRS = xquartz
endif
SUBDIRS = \
@@ -32,9 +32,9 @@ SUBDIRS = \
$(XWIN_SUBDIRS) \
$(XVFB_SUBDIRS) \
$(XNEST_SUBDIRS) \
- $(DMX_SUBDIRS) \
- $(KDRIVE_SUBDIRS) \
- $(DARWIN_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 a2d8661..e10076f 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 8c397a7..d599258 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -117,7 +117,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 a24c107..02132e8 100644
--- a/hw/xprint/attributes.c
+++ b/hw/xprint/attributes.c
@@ -1379,7 +1379,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 6cd3cfd..67b73a6 100644
--- a/hw/xprint/ddxInit.c
+++ b/hw/xprint/ddxInit.c
@@ -199,7 +199,7 @@ ProcessInputEvents(void)
{
}
-#ifdef __DARWIN__
+#ifdef __APPLE__
#include "micmap.h"
void GlxExtensionInit(void);
diff --git a/include/cursor.h b/include/cursor.h
index bdf4fd3..dc0810c 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 709da62..d6d13b4 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 fd0caae..ca37248 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 bddeb25..6e62b87 100644
--- a/include/window.h
+++ b/include/window.h
@@ -134,7 +134,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(
@@ -145,7 +145,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 3e326bf..ab0187e 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)
More information about the xorg-commit
mailing list