[xserver-commit] xfree86/os-support/linux/int10 Makefile.am,1.1,1.2 linux.c,1.32,1.33

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xfree86/os-support/linux/int10
In directory pdx:/tmp/cvs-serv18069/os-support/linux/int10

Modified Files:
	Makefile.am linux.c 
Log Message:
	* configure.ac:
	* os-support/linux/Makefile.am:
	* os-support/linux/int10/Makefile.am:
	* os-support/linux/drm/Makefile.am:
	* Finish os-support/linux's autotooling with int10 and drm.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/int10/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/Makefile.am	19 Feb 2004 03:50:06 -0000	1.1
+++ b/Makefile.am	19 Feb 2004 14:02:16 -0000	1.2
@@ -1,4 +1,7 @@
+INCLUDES = $(XF86_INCS) -I$(srcdir)/../../../int10
+AM_CFLAGS = $(XF86_CFLAGS)
+
 lib_LIBRARIES = libxf86linuxint10.a
-libxf86linuxint10_a_SOURCES = linux.c $(srcdir)/../../../int10/helper_mem.c \
-                              $(srcdir)/../../../int10/pci.c \
-                              $(srcdir)/../../../int10/xf86int10module.c
+libxf86linuxint10_a_SOURCES = linux.c ../../../int10/helper_mem.c \
+                              ../../../int10/pci.c \
+                              ../../../int10/xf86int10module.c

Index: linux.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/int10/linux.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- a/linux.c	19 Feb 2004 03:51:38 -0000	1.32
+++ b/linux.c	19 Feb 2004 14:02:16 -0000	1.33
@@ -15,14 +15,14 @@
 #else
 #define DEV_MEM "/dev/mem"
 #endif
-#ifndef XFree86LOADER
 #include <sys/mman.h>
 #ifndef MAP_FAILED
 #define MAP_FAILED ((void *)-1)
 #endif
-#endif
 #define ALLOC_ENTRIES(x) ((V_RAM / x) - 1)
 #define SHMERRORPTR (pointer)(-1)
+#include <sys/ipc.h>
+#include <sys/shm.h>
 
 static int counter = 0;
 static unsigned long int10Generation = 0;