define DRM_USE_MALLOC for SOLO build and remove SIGIO requirement

5 files changed, 5 insertions, 7 deletions

diff --git a/configs/default b/configs/default
index 22e3fd830b..cd49ea8ff8 100644
--- a/configs/default
+++ b/configs/default
@@ -11,7 +11,7 @@ MESA_MINOR=3
 MESA_TINY=0
 
 # external projects
-DRM_SOURCE_PATH=$(TOP)/../drm
+DRM_SOURCE_PATH=/X11R6/SourceForge/DRI-freedesktop/drm
 
 # Compiler and flags
 CC = cc
diff --git a/configs/linux-solo b/configs/linux-solo
index d2d602d5ea..d9bb624c3b 100644
--- a/configs/linux-solo
+++ b/configs/linux-solo
@@ -8,7 +8,7 @@ CONFIG_NAME = linux-solo
 CC = gcc
 CXX = g++
 
-DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1
+DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1 -DDRM_USE_MALLOC
 
 CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math
 
diff --git a/configs/linux-solo-ia64 b/configs/linux-solo-ia64
index 200ce11aa1..ec7a794e5a 100644
--- a/configs/linux-solo-ia64
+++ b/configs/linux-solo-ia64
@@ -8,7 +8,7 @@ CONFIG_NAME = linux-solo-ia64
 CC = gcc
 CXX = g++
 
-DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE
+DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -DDRM_USE_MALLOC
 
 CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math
 
diff --git a/configs/linux-solo-x86 b/configs/linux-solo-x86
index 8bdd5f89a6..5182c865e7 100644
--- a/configs/linux-solo-x86
+++ b/configs/linux-solo-x86
@@ -8,7 +8,7 @@ CONFIG_NAME = linux-solo-x86
 CC = gcc
 CXX = g++
 
-DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1
+DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DDRM_USE_MALLOC
 
 CFLAGS = $(DEFINES) -Wmissing-prototypes -O3 -g -std=c99 -Wundef -fPIC -ffast-math
 
diff --git a/src/mesa/drivers/dri/dri_client/xf86drm.c b/src/mesa/drivers/dri/dri_client/xf86drm.c
index 2b0b1b9cc4..dba0f98deb 100644
--- a/src/mesa/drivers/dri/dri_client/xf86drm.c
+++ b/src/mesa/drivers/dri/dri_client/xf86drm.c
@@ -62,8 +62,6 @@
 # ifdef DRM_USE_MALLOC
 #  define _DRM_MALLOC malloc
 #  define _DRM_FREE   free
-extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);
-extern int xf86RemoveSIGIOHandler(int fd);
 # else
 #  include <X11/Xlibint.h>
 #  define _DRM_MALLOC Xmalloc
@@ -2268,7 +2266,7 @@ int drmCommandWriteRead(int fd, unsigned long drmCommandIndex,
     return 0;
 }
 
-#if defined(XFree86Server) || defined(DRM_USE_MALLOC)
+#if defined(XFree86Server)
 static void drmSIGIOHandler(int interrupt, void *closure)
 {
     unsigned long key;