frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix linux build without libc wrappers (From Fredrik Höglund)

This commit is contained in:
Benjamin Herrenschmidt 2006-02-13 04:56:27 +00:00
parent 2dc7b5e0d9
commit 1a4f20541a
7 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2006-02-13 Benjamin Herrenschmidt <benh@kernel.crashing.org>
* cfb/Makefile.am:
* cfb16/Makefile.am:
* cfb32/Makefile.am:
* hw/xfree86/fbdevhw/fbdevhw.c:
* hw/xfree86/os-support/linux/int10/linux.c:
* hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c:
Fix linux build without libc wrappers (From Fredrik
Höglund)
2006-02-13 Benjamin Herrenschmidt <benh@kernel.crashing.org> 2006-02-13 Benjamin Herrenschmidt <benh@kernel.crashing.org>
* hw/kdrive/src/kdrive.c: (ddxInitGlobals): * hw/kdrive/src/kdrive.c: (ddxInitGlobals):

2
cfb/Makefile.am
View File

@ -11,7 +11,7 @@ libcfb_la_LIBADD = ../mfb/libmfb.la
AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/common
EXTRA_DIST = cfbline.c cfbfillarc.c cfbzerarc.c cfbblt.c cfbsolid.c \ EXTRA_DIST = cfbline.c cfbfillarc.c cfbzerarc.c cfbblt.c cfbsolid.c \
cfbtileodd.c cfbtile32.c cfb8line.c cfbply1rct.c cfbglblt8.c \ cfbtileodd.c cfbtile32.c cfb8line.c cfbply1rct.c cfbglblt8.c \

2
cfb16/Makefile.am
View File

@ -4,6 +4,6 @@ include $(top_srcdir)/cfb/Makefile.am.inc
libcfb16_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources) libcfb16_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/common
AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@

2
cfb32/Makefile.am
View File

@ -4,6 +4,6 @@ include $(top_srcdir)/cfb/Makefile.am.inc
libcfb32_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources) libcfb32_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/common
AM_CFLAGS = -DPSZ=32 $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = -DPSZ=32 $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@

10
hw/xfree86/fbdevhw/fbdevhw.c
View File

@ -78,14 +78,16 @@ fbdevhwSetup(pointer module, pointer opts, int *errmaj, int *errmin)
return (pointer)1; return (pointer)1;
} }
} }
#endif /* XFree86LOADER */
#else /* XFree86LOADER */
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/ioctl.h>
#endif /* XFree86LOADER */ #include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* our private data, and two functions to allocate/free this */ /* our private data, and two functions to allocate/free this */

8
hw/xfree86/os-support/linux/int10/linux.c
View File

@ -27,6 +27,14 @@
#define ALLOC_ENTRIES(x) ((V_RAM / x) - 1) #define ALLOC_ENTRIES(x) ((V_RAM / x) - 1)
#define SHMERRORPTR (pointer)(-1) #define SHMERRORPTR (pointer)(-1)
#include <fcntl.h>
#include <errno.h>
#include <sys/mman.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <unistd.h>
#include <string.h>
static int counter = 0; static int counter = 0;
static unsigned long int10Generation = 0; static unsigned long int10Generation = 0;

3
hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
View File

@ -4,6 +4,9 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#include <errno.h>
#include <string.h>
#include "xf86.h" #include "xf86.h"
#include "xf86_OSproc.h" #include "xf86_OSproc.h"
#include "xf86Pci.h" #include "xf86Pci.h"