andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Darwin: Use __APPLE__ instead of __DARWIN__

Browse Source 
(cherry picked from commit 54654815fa)
This commit is contained in:
Jeremy Huddleston 2007-12-07 18:53:08 -08:00
parent 4ae5621664
commit aed01c4a8b
12 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GL/glx/glxscreens.c
View File

@ -170,7 +170,7 @@ static char GLXServerExtensions[] =
"GLX_EXT_texture_from_pixmap " "GLX_EXT_texture_from_pixmap "
"GLX_OML_swap_method " "GLX_OML_swap_method "
"GLX_SGI_make_current_read " "GLX_SGI_make_current_read "
#ifndef __DARWIN__ #ifndef __APPLE__
"GLX_SGIS_multisample " "GLX_SGIS_multisample "
"GLX_SGIX_hyperpipe " "GLX_SGIX_hyperpipe "
"GLX_SGIX_swap_barrier " "GLX_SGIX_swap_barrier "

2
configure.ac
View File

@ -1748,7 +1748,7 @@ if test "x$XQUARTZ" = xyes; then
AC_SUBST([DARWIN_LIBS]) AC_SUBST([DARWIN_LIBS])
AC_CHECK_LIB([Xplugin],[xp_init],[:]) AC_CHECK_LIB([Xplugin],[xp_init],[:])
AC_SUBST([APPLE_APPLICATIONS_DIR]) AC_SUBST([APPLE_APPLICATIONS_DIR])
CFLAGS="${CFLAGS} -D__DARWIN__ -DROOTLESS_WORKAROUND -DNO_ALLOCA" CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DNO_ALLOCA"
PLIST_VERSION_STRING=$PACKAGE_VERSION PLIST_VERSION_STRING=$PACKAGE_VERSION
AC_SUBST([PLIST_VERSION_STRING]) AC_SUBST([PLIST_VERSION_STRING])
PLIST_VENDOR_WEB=$VENDOR_WEB PLIST_VENDOR_WEB=$VENDOR_WEB

8
hw/Makefile.am
View File

@ -23,7 +23,7 @@ XPRINT_SUBDIRS = xprint
endif endif
if XQUARTZ if XQUARTZ
DARWIN_SUBDIRS = xquartz XQUARTZ_SUBDIRS = xquartz
endif endif
SUBDIRS = \ SUBDIRS = \
@ -32,9 +32,9 @@ SUBDIRS = \
$(XWIN_SUBDIRS) \ $(XWIN_SUBDIRS) \
$(XVFB_SUBDIRS) \ $(XVFB_SUBDIRS) \
$(XNEST_SUBDIRS) \ $(XNEST_SUBDIRS) \
$(DMX_SUBDIRS) \ $(DMX_SUBDIRS) \
$(KDRIVE_SUBDIRS) \ $(KDRIVE_SUBDIRS) \
$(DARWIN_SUBDIRS) \ $(XQUARTZ_SUBDIRS) \
$(XPRINT_SUBDIRS) $(XPRINT_SUBDIRS)
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint

2
hw/vfb/InitOutput.c
View File

@ -220,7 +220,7 @@ AbortDDX()
ddxGiveUp(); ddxGiveUp();
} }
#ifdef __DARWIN__ #ifdef __APPLE__
void void
DarwinHandleGUI(int argc, char *argv[]) DarwinHandleGUI(int argc, char *argv[])
{ {

2
hw/xnest/Init.c
View File

@ -124,7 +124,7 @@ void ddxGiveUp()
AbortDDX(); AbortDDX();
} }
#ifdef __DARWIN__ #ifdef __APPLE__
void void
DarwinHandleGUI(int argc, char *argv[]) DarwinHandleGUI(int argc, char *argv[])
{ {

2
hw/xprint/attributes.c
View File

@ -1378,7 +1378,7 @@ ReplaceAllKeywords(
defined(ISC) || \ defined(ISC) || \
defined(Lynx) || \ defined(Lynx) || \
defined(__QNX__) || \ defined(__QNX__) || \
defined(__DARWIN__) defined(__APPLE__)
#define iswspace(c) (isascii(c) && isspace(toascii(c))) #define iswspace(c) (isascii(c) && isspace(toascii(c)))
#endif #endif

2
hw/xprint/ddxInit.c
View File

@ -205,7 +205,7 @@ ProcessInputEvents(void)
{ {
} }
#ifdef __DARWIN__ #ifdef __APPLE__
#include "micmap.h" #include "micmap.h"
void GlxExtensionInit(void); void GlxExtensionInit(void);

2
include/cursor.h
View File

@ -70,7 +70,7 @@ extern int FreeCursor(
/* Quartz support on Mac OS X pulls in the QuickDraw /* Quartz support on Mac OS X pulls in the QuickDraw
framework whose AllocCursor function conflicts here. */ framework whose AllocCursor function conflicts here. */
#ifdef __DARWIN__ #ifdef __APPLE__
#define AllocCursor Darwin_X_AllocCursor #define AllocCursor Darwin_X_AllocCursor
#endif #endif
extern CursorPtr AllocCursor( extern CursorPtr AllocCursor(

2
include/dixfont.h
View File

@ -118,7 +118,7 @@ extern void DeleteClientFontStuff(ClientPtr /*client*/);
/* Quartz support on Mac OS X pulls in the QuickDraw /* Quartz support on Mac OS X pulls in the QuickDraw
framework whose InitFonts function conflicts here. */ framework whose InitFonts function conflicts here. */
#ifdef __DARWIN__ #ifdef __APPLE__
#define InitFonts Darwin_X_InitFonts #define InitFonts Darwin_X_InitFonts
#endif #endif
extern void InitFonts(void); extern void InitFonts(void);

2
include/resource.h
View File

@ -153,7 +153,7 @@ extern XID FakeClientID(
/* Quartz support on Mac OS X uses the CarbonCore /* Quartz support on Mac OS X uses the CarbonCore
framework whose AddResource function conflicts here. */ framework whose AddResource function conflicts here. */
#ifdef __DARWIN__ #ifdef __APPLE__
#define AddResource Darwin_X_AddResource #define AddResource Darwin_X_AddResource
#endif #endif
extern Bool AddResource( extern Bool AddResource(

4
include/window.h
View File

@ -125,7 +125,7 @@ extern void DestroySubwindows(
/* Quartz support on Mac OS X uses the HIToolbox /* Quartz support on Mac OS X uses the HIToolbox
framework whose ChangeWindowAttributes function conflicts here. */ framework whose ChangeWindowAttributes function conflicts here. */
#ifdef __DARWIN__ #ifdef __APPLE__
#define ChangeWindowAttributes Darwin_X_ChangeWindowAttributes #define ChangeWindowAttributes Darwin_X_ChangeWindowAttributes
#endif #endif
extern int ChangeWindowAttributes( extern int ChangeWindowAttributes(
@ -136,7 +136,7 @@ extern int ChangeWindowAttributes(
/* Quartz support on Mac OS X uses the HIToolbox /* Quartz support on Mac OS X uses the HIToolbox
framework whose GetWindowAttributes function conflicts here. */ framework whose GetWindowAttributes function conflicts here. */
#ifdef __DARWIN__ #ifdef __APPLE__
#define GetWindowAttributes(w,c,x) Darwin_X_GetWindowAttributes(w,c,x) #define GetWindowAttributes(w,c,x) Darwin_X_GetWindowAttributes(w,c,x)
extern void Darwin_X_GetWindowAttributes( extern void Darwin_X_GetWindowAttributes(
#else #else

4
miext/rootless/rootlessConfig.h
View File

@ -34,7 +34,7 @@
#ifndef _ROOTLESSCONFIG_H #ifndef _ROOTLESSCONFIG_H
#define _ROOTLESSCONFIG_H #define _ROOTLESSCONFIG_H
#ifdef __DARWIN__ #ifdef __APPLE__
# define ROOTLESS_ACCEL TRUE # define ROOTLESS_ACCEL TRUE
# define ROOTLESS_GLOBAL_COORDS TRUE # define ROOTLESS_GLOBAL_COORDS TRUE
@ -48,7 +48,7 @@
alpha for 16bpp. */ alpha for 16bpp. */
# define RootlessAlphaMask(bpp) ((bpp) == 32 ? 0xFF000000 : 0) # define RootlessAlphaMask(bpp) ((bpp) == 32 ? 0xFF000000 : 0)
#endif /* __DARWIN__ */ #endif /* __APPLE__ */
#if defined(__CYGWIN__) || defined(WIN32) #if defined(__CYGWIN__) || defined(WIN32)