xserver: Branch 'master'

[Greg Kroah-Hartman]

 hw/xfree86/os-support/shared/libc_wrapper.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree cc3e99f747586f9d32622e5a682de39891b1fcba (from 59836c0f2abee3339e1aa30dacadb82e477943d6)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Jul 5 10:13:19 2006 -0700

    fix some more compiler warnings due to defines being declared differently

diff --git a/hw/xfree86/os-support/shared/libc_wrapper.c b/hw/xfree86/os-support/shared/libc_wrapper.c
index 1663893..fb1363a 100644
--- a/hw/xfree86/os-support/shared/libc_wrapper.c
+++ b/hw/xfree86/os-support/shared/libc_wrapper.c
@@ -89,8 +89,8 @@ extern int mmapFd;
 #include <stdlib.h>
 #endif
 
-#define NEED_XF86_TYPES
-#define NEED_XF86_PROTOTYPES
+#define NEED_XF86_TYPES 1
+#define NEED_XF86_PROTOTYPES 1
 #define DONT_DEFINE_WRAPPERS
 #include "xf86_ansic.h"