diff options
| author | Keith Packard <keithp@keithp.com> | 2009-01-12 11:51:28 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-01-12 11:51:28 -0800 |
| commit | 71628cabc9dddf5c9fe12d555ae0c47d5902b2f7 (patch) | |
| tree | c96b1c2ab4ee8f8ea9d611f863a7e92b7c5158f1 | |
| parent | cbd977cc15cf22a3e42b10942d5657cb8b9ac335 (diff) | |
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>
| -rw-r--r-- | include/dix-config-post-verbatim.h | 10 | ||||
| -rw-r--r-- | include/dix-config.h.in | 9 |
2 files changed, 8 insertions, 11 deletions
diff --git a/include/dix-config-post-verbatim.h b/include/dix-config-post-verbatim.h deleted file mode 100644 index 4bbb9b031..000000000 --- a/include/dix-config-post-verbatim.h +++ /dev/null @@ -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 diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 977bff3e9..8e047c491 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -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_ */ |