Module Name: src Committed By: christos Date: Wed Jul 29 19:03:15 UTC 2015
Modified Files: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10: Makefile Log Message: Don't use NO_SYS_HEADERS because <sys/types.h> is not included when you do that before the typedefs in /usr/xsrc/external/mit/xorg-server/dist/hw/\ xfree86/x86emu/x86emu/types.h, and then some source files include <sys/types.h> leading to uint redefinitions. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.8 src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.9 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.8 Thu Aug 11 19:15:41 2011 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile Wed Jul 29 15:03:15 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:41 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2015/07/29 19:03:15 christos Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules @@ -12,7 +12,7 @@ SRCS= x86emu.c generic.c xf86x86emu.c x helper_exec.c xf86int10module.c CPPFLAGS+= -D__DRIVER__ -DFORCE_POST -D_CEXPORT= -DNO_LONG_LONG \ - -D_X86EMU -DNO_SYS_HEADERS + -D_X86EMU .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" CPPFLAGS+= -D_PC