xserver: Branch 'server-1.6-branch' - 2 commits

[Jeremy Huddleston]

Keith,

We needed this stuff to be in dix-config-post-verbatim.h since  
configure would change:
"#undef _XSERVER64" to "/* #undef _XSERVER64 */" or "#define  
_XSERVER64 1" at configure time, but we need that to be at compile  
time since we will be building for 32bit and 64bit targets at the same  
time.

On Jan 12, 2009, at 13:08, Keith Packard wrote:

> configure.ac                       |    2 +-
> include/dix-config-post-verbatim.h |   10 ----------
> include/dix-config.h.in            |    9 ++++++++-
> 3 files changed, 9 insertions(+), 12 deletions(-)
>
> New commits:
> commit 251d0d8090322b2c9dc0c8b7bef001f338d19433
> Author: Keith Packard <keithp at keithp.com>
> Date:   Mon Jan 12 13:03:30 2009 -0800
>
>    Update version to 1.5.99.901 (1.6 RC1)
>
> diff --git a/configure.ac b/configure.ac
> index cd53288..da5f488 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -26,7 +26,7 @@ dnl
> dnl Process this file with autoconf to create configure.
>
> AC_PREREQ(2.57)
> -AC_INIT([xorg-server], 1.5.99.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg 
> ], xorg-server)
> +AC_INIT([xorg-server], 1.5.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg 
> ], xorg-server)
> AC_CONFIG_SRCDIR([Makefile.am])
> AM_INIT_AUTOMAKE([dist-bzip2 foreign])
> AM_MAINTAINER_MODE
> commit 71628cabc9dddf5c9fe12d555ae0c47d5902b2f7
> Author: Keith Packard <keithp at keithp.com>
> Date:   Mon Jan 12 11:51:28 2009 -0800
>
>    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 at keithp.com>
>
> diff --git a/include/dix-config-post-verbatim.h b/include/dix-config- 
> post-verbatim.h
> deleted file mode 100644
> index 4bbb9b0..0000000
> --- 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 977bff3..8e047c4 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_ */
> _______________________________________________
> xorg-commit mailing list
> xorg-commit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/xorg-commit