gallium: Allow compilation inside X.

diff --git a/src/gallium/auxiliary/util/u_string.h b/src/gallium/auxiliary/util/u_string.h
index abc3232b492de4e0d643fbf219000e34211e00c7..08c89bbf7708f976422811a75bad7b593fc6cafa 100644 (file)
--- a/src/gallium/auxiliary/util/u_string.h
+++ b/src/gallium/auxiliary/util/u_string.h
@@ -28,14 +28,14 @@
 /**
  * @file
  * Platform independent functions for string manipulation.
- * 
+ *
  * @author Jose Fonseca <jrfonseca@tungstengraphics.com>
  */
 
 #ifndef U_STRING_H_
 #define U_STRING_H_
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(XF86_LIBC_H)
 #include <stdio.h>
 #endif
 #include <stddef.h>
@@ -48,19 +48,19 @@
 extern "C" {
 #endif
 
-   
+
 #ifdef WIN32
-   
+
 int util_vsnprintf(char *, size_t, const char *, va_list);
 int util_snprintf(char *str, size_t size, const char *format, ...);
 
-static INLINE void 
+static INLINE void
 util_vsprintf(char *str, const char *format, va_list ap)
 {
    util_vsnprintf(str, (size_t)-1, format, ap);
 }
 
-static INLINE void 
+static INLINE void
 util_sprintf(char *str, const char *format, ...)
 {
    va_list ap;

diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
index 2afb8464c736b3e56058a51b155e65e2f997ba17..4d64c74a4aa6c6a1a565d46239221cf439c1fb15 100644 (file)
--- a/src/gallium/include/pipe/p_compiler.h
+++ b/src/gallium/include/pipe/p_compiler.h
@@ -31,8 +31,13 @@
 
 #include "p_config.h"
 
+#ifndef XFree86Server
 #include <stdlib.h>
 #include <string.h>
+#else
+#include "xf86_ansic.h"
+#include "xf86_libc.h"
+#endif
 
 
 #if defined(_WIN32) && !defined(__WIN32__)