Merge include/dix-config-post-verbatim.h into include/dix-config.h.in

No sense having an extra include file here; it makes building stuff harder.

Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard 2009-01-12 11:51:28 -08:00
parent cbd977cc15
commit 71628cabc9
2 changed files with 8 additions and 11 deletions

View file

@ -1,10 +0,0 @@
/* Do not include this file directly. It is included at the end of <dix-config.h> */
/* Correctly set _XSERVER64 for OSX fat binaries */
#ifdef __APPLE__
#if defined(__LP64__) && !defined(_XSERVER64)
#define _XSERVER64 1
#elif !defined(__LP64__) && defined(_XSERVER64)
#undef _XSERVER64
#endif
#endif

View file

@ -429,6 +429,13 @@
/* Define to 1 if you have the `ffs' function. */
#undef HAVE_FFS
#include <dix-config-post-verbatim.h>
/* Correctly set _XSERVER64 for OSX fat binaries */
#ifdef __APPLE__
#if defined(__LP64__) && !defined(_XSERVER64)
#define _XSERVER64 1
#elif !defined(__LP64__) && defined(_XSERVER64)
#undef _XSERVER64
#endif
#endif
#endif /* _DIX_CONFIG_H_ */