Mesa (mesa_7_6_branch): llvmpipe: asst fixes for 'make linux-llvmpipe'

[Brian Paul]

Module: Mesa
Branch: mesa_7_6_branch
Commit: d81086a86bd7c82eae5a8f0d1092a30c23626257
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d81086a86bd7c82eae5a8f0d1092a30c23626257

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Sep 11 13:39:14 2009 -0600

llvmpipe: asst fixes for 'make linux-llvmpipe'

---

 src/gallium/drivers/llvmpipe/Makefile   |    2 ++
 src/gallium/winsys/xlib/Makefile        |    1 +
 src/gallium/winsys/xlib/xlib_llvmpipe.c |    3 +++
 3 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile
index 6e63a0c..5ac09de 100644
--- a/src/gallium/drivers/llvmpipe/Makefile
+++ b/src/gallium/drivers/llvmpipe/Makefile
@@ -3,6 +3,8 @@ include $(TOP)/configs/current
 
 LIBNAME = llvmpipe
 
+CFLAGS += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
+
 C_SOURCES = \
 	lp_bld_alpha.c \
 	lp_bld_arit.c \
diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile
index 522f6dc..3a1945d 100644
--- a/src/gallium/winsys/xlib/Makefile
+++ b/src/gallium/winsys/xlib/Makefile
@@ -34,6 +34,7 @@ XLIB_WINSYS_SOURCES = \
 	xlib_brw_aub.c \
 	xlib_brw_context.c \
 	xlib_brw_screen.c \
+	xlib_llvmpipe.c \
 	xlib_softpipe.c \
 	xlib_trace.c 
 
diff --git a/src/gallium/winsys/xlib/xlib_llvmpipe.c b/src/gallium/winsys/xlib/xlib_llvmpipe.c
index bc87659..3dd15e0 100644
--- a/src/gallium/winsys/xlib/xlib_llvmpipe.c
+++ b/src/gallium/winsys/xlib/xlib_llvmpipe.c
@@ -33,6 +33,8 @@
  */
 
 
+#if defined(GALLIUM_LLVMPIPE)
+
 #include "xm_api.h"
 
 #undef ASSERT
@@ -459,3 +461,4 @@ struct xm_driver xlib_llvmpipe_driver =
 
 
 
+#endif /* GALLIUM_LLVMPIPE */