diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-01-15 21:03:27 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-01-15 21:03:27 -0800 |
| commit | 1c504dff8a84804888f18ee9b184f0c4584185d7 (patch) | |
| tree | 01e8c611946f47d1ec5440b68d206be83847e21c /include/dix-config.h.in | |
| parent | 717a961528ec69a6e630d536e15568670e0b398a (diff) | |
XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where appropriate on fat binary compilation
Diffstat (limited to 'include/dix-config.h.in')
| -rw-r--r-- | include/dix-config.h.in | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 977bff3e9..e1d226c84 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -429,6 +429,14 @@ /* 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) +/* configure mangles #undef, so we fix this in AC_CONFIG_HEADERS post process */ +/undef _XSERVER64 +#endif +#endif #endif /* _DIX_CONFIG_H_ */ |