Attachment 2001 Details for Bug 1712 – Add DragonFly support

[patch] Add DragonFly support

xorg_dragonfly_support_xc_head.diff (text/plain), 21.04 KB, created by Mike Verona on 2005-03-01 19:57:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Verona

Created: 2005-03-01 19:57:19 UTC

Size: 21.04 KB

patch

obsolete

>Index: xc/config/cf/DragonFly.cf
>===================================================================
>RCS file: xc/config/cf/DragonFly.cf
>diff -N xc/config/cf/DragonFly.cf
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ xc/config/cf/DragonFly.cf	2 Mar 2005 03:39:18 -0000
>@@ -0,0 +1,354 @@
>+XCOMM $XdotOrg: xc/config/cf/DragonFly.cf,v 1.1 2005/02/19 02:02:31 marvis Exp $
>+
>+#define UseElfFormat        YES
>+
>+#define OSBinaryFormat        [ELF]
>+
>+#ifndef OSName
>+#define OSName            DefaultOSName OSBinaryFormat
>+#endif
>+#ifndef OSVendor
>+#define OSVendor        /**/
>+#endif
>+#ifndef OSMajorVersion
>+#define OSMajorVersion        DefaultOSMajorVersion
>+#endif
>+#ifndef OSMinorVersion
>+#define OSMinorVersion        DefaultOSMinorVersion
>+#endif
>+
>+#ifndef OSRelVersion
>+/* Include this to get finer-grained information about the OS version */
>+#include "/usr/include/osreldate.h"
>+#define OSRelVersion __DragonFly_version
>+#endif
>+
>+XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion) (OSRelVersion)
>+
>+/*
>+ * Base OS setup
>+ */
>+#define HasCplusplus             YES
>+#define GccUsesGas               YES
>+#define UseGas                   YES
>+#define GnuCpp                   YES
>+#define HasBasename              YES
>+#define HasBSD44Sockets          YES
>+#define HasDlopen                YES
>+#define HasGetIfAddrs            YES
>+#define HasIssetugid             YES
>+#define HasLibCrypt              YES
>+#define HasMktemp                YES
>+#define HasNCurses               YES
>+#define HasNdbm                  YES
>+#define HasPlugin                YES
>+#define HasPoll                  YES
>+#define HasPutenv                YES
>+#define HasUsableFileMmap        YES
>+#define HasSetProcTitle          YES
>+#define HasShm                   YES
>+#define HasSnprintf              YES
>+#define HasStrlcat               YES
>+#define HasVarDb                 YES
>+#define HasVarRun                YES
>+#define HasWChar32               YES
>+#define HasWeakSymbols           UseElfFormat
>+#define BuildXaw6                NO /*depreciated*/
>+#define BuildXaw7                NO /*depreciated*/
>+#define BuildXaw                 YES /*needed*/
>+#ifndef BuildPDFdocs
>+#define BuildPDFdocs NO
>+#endif
>+#define IPv6SocketsAlsoIPv4      NO
>+#define InstallXloadSetGID       NO
>+
>+/*
>+ * Multi-thread safe libs
>+ */
>+#ifndef HasLibPthread
>+# define HasLibPthread           NO
>+#endif
>+#define HasPosixThreads          YES
>+#define ThreadedX                YES
>+#define SystemMTDefines          -D_REENTRANT -D_THREAD_SAFE
>+#define HasThreadSafeAPI         YES
>+#define MTSafeAPIDefines         -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
>+#if HasLibPthread
>+# define ThreadsLibraries        -lpthread
>+#else
>+# define ThreadsLibraries        -pthread
>+#endif
>+
>+
>+#define AvoidNullMakeCommand     YES
>+#define StripInstalledPrograms   YES
>+#define CompressAllFonts         YES
>+#define Malloc0ReturnsNull       YES
>+#define NeedConstPrototypes      YES
>+#define NeedFunctionPrototypes   YES
>+#define NeedNestedPrototypes     YES
>+#define NeedVarargsPrototypes    YES
>+#define NeedWidePrototypes       NO
>+
>+#define MkdirHierCmd             mkdir -p
>+
>+#define LexCmd                   flex -l
>+#define HasFlex                  YES
>+
>+#ifndef CcCmd
>+# define CcCmd                   cc
>+#endif
>+#ifndef CplusplusCmd
>+# define CplusplusCmd            c++
>+#endif
>+#define CppCmd                   /usr/bin/cpp
>+#define PreProcessCmd            CppCmd
>+#define StandardCppOptions       -traditional
>+#define StandardCppDefines       /**/
>+#ifndef DefaultCCOptions
>+# if defined(UseInstalled)
>+#  define DefaultCCOptions       /**/
>+# else
>+#  if defined(HasGcc3) && HasGcc3
>+#   define NoSystemWarn         -Wno-system-headers
>+#  else
>+#   define NoSystemWarn
>+# endif
>+# define DefaultCCOptions -ansi NoSystemWarn -Dasm=__asm GccWarningOptions
>+#endif
>+#ifndef ExtraLibraries
>+/* support for multi-byte locales is in libxpg4 rather than libc */
>+#define ExtraLibraries          -lxpg4
>+#endif
>+#define HasSetUserContext       YES
>+#define HasGetpeereid           YES
>+#define HasMTRRSupport          YES
>+
>+#ifndef BuildXF86DRI
>+# define BuildXF86DRI           YES
>+#endif
>+
>+#if defined(i386Architecture)
>+#define HasAgpGart              YES
>+#endif
>+
>+/*
>+ * SSE and 3DNow will be autodetected, so binutils is the only
>+ * requirement for enabling this.
>+ */
>+#if defined(i386Architecture)
>+# define HasX86Support          YES
>+# define HasMMXSupport          YES
>+# define Has3DNowSupport        YES
>+# define HasSSESupport          YES
>+#else
>+# define HasX86Support          NO
>+# define HasMMXSupport          NO
>+# define Has3DNowSupport        NO
>+# define HasSSESupport          NO
>+#endif
>+
>+#ifndef UseRpath
>+# define UseRpath               YES
>+#endif
>+
>+#ifndef RpathLoadFlags
>+# if UseRpath
>+#  define RpathLoadFlags        -Wl,-rpath,$(USRLIBDIRPATH)
>+# else
>+#  define RpathLoadFlags        /**/
>+# endif
>+#endif
>+
>+#ifndef ExtraLoadFlags
>+# if !defined(UseInstalled)
>+#  define ExtraLoadFlags     RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
>+# else
>+#  define ExtraLoadFlags     RpathLoadFlags
>+# endif
>+#endif
>+
>+#endif
>+
>+#ifndef LibraryRpathLoadFlags
>+# if UseRpath
>+#  define LibraryRpathLoadFlags  -rpath $(USRLIBDIRPATH)
>+# else
>+#  define LibraryRpathLoadFlags  /**/
>+# endif
>+#endif
>+
>+#ifndef SharedLibraryLoadFlags
>+# define SharedLibraryLoadFlags  -shared LibraryRpathLoadFlags
>+#endif
>+
>+#ifndef HasZlib
>+# define HasZlib                 YES
>+#endif
>+
>+#ifndef HasPam
>+# define HasPam                  YES
>+#endif
>+
>+/* Take from FreeBSD */
>+/* There are two options for building.  One is to assume that the system has
>+ * many of the dependencies provided by the ports tree.  The other is to just
>+ * build everything from this tree.
>+ */
>+
>+#ifndef HasStandardPorts
>+# define HasStandardPorts        YES
>+#endif
>+
>+#ifndef LocalBase
>+# define LocalBase               /usr/local
>+#endif
>+#ifndef X11Base
>+# define X11Base                 /usr/X11R6
>+#endif
>+
>+#if HasStandardPorts
>+
>+#ifndef HasExpat
>+# define HasExpat                YES
>+# define ExpatDir                LocalBase
>+#endif
>+
>+#ifndef HasFreetype2
>+# define HasFreetype2            NO /* set this to YES once DragonFly ships FT218 */
>+# define Freetype2Dir            LocalBase
>+#endif
>+
>+#ifndef HasFontconfig
>+# define HasFontconfig           YES
>+# define FontconfigDir           X11Base
>+#endif
>+
>+#ifndef HasLibpng
>+# define HasLibpng               YES
>+# define LibpngDir               LocalBase
>+#endif
>+
>+#endif /* HasStandardPorts */
>+
>+#undef  InstallCmd
>+#define InstallCmd               /usr/bin/install
>+
>+#define AsmElfDefines            -D__ELF__
>+
>+#if GccUsesGas
>+# define GccGasOption            -DGCCUSESGAS
>+# define AsmDefines              -DUSE_GAS AsmElfDefines
>+#else
>+# define GccGasOption            /**/
>+# define AsmDefines              AsmElfDefines
>+#endif
>+
>+#ifdef i386Architecture
>+#define ServerExtraDefines GccGasOption XFree86ServerDefines
>+#endif
>+#if defined(Sparc64Architecture) || defined(ia64Architecture) || \
>+    defined(AMD64Architecture)
>+#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
>+#endif
>+
>+#define StandardDefines          -DCSRG_BASED
>+
>+#define ServerOSDefines          XFree86ServerOSDefines -DDDXTIME
>+#define XawI18nDefines           -DUSE_XWCHAR_STRING
>+#define HasMakefileSafeInclude   YES
>+#define IncludeMakefile(file) @@# dependencies are in .depend
>+#define DependFileName        .depend
>+#ifndef DoLoadableServer
>+# define DoLoadableServer      YES
>+#endif
>+#ifndef ForceNormalLib
>+# define ForceNormalLib        YES
>+#endif
>+#define HasMkstemp        YES
>+
>+#define OptimizedCDebugFlags -O
>+
>+#ifndef PreIncDir
>+# define PreIncDir    /usr/include
>+#endif
>+
>+#define HasGroff    YES
>+#define NroffCmd    env GROFF_NO_SGR=y groff -Tascii
>+#define SetTtyGroup    YES
>+
>+#ifndef ExtraFilesToClean
>+# define ExtraFilesToClean *.core
>+#endif
>+
>+#define DefaultUserPath        /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/local/bin
>+#define DefaultSystemPath    /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR)
>+#ifndef SystemManDirectory
>+# define SystemManDirectory    /usr/share/man
>+#endif
>+
>+#define InstKmemFlags    -g kmem -m 2755
>+
>+/*
>+ * Compress manual pages
>+ */
>+#ifndef CompressManPages
>+# define CompressManPages    YES
>+#endif
>+
>+#define HasBsdMake    YES
>+
>+#ifndef StaticLibrary
>+# define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
>+#endif
>+
>+#define DlLibrary        -Wl,--export-dynamic
>+
>+#ifndef PamLibraries
>+# define PamLibraries        -lpam DlLibrary
>+#endif
>+
>+#ifndef SharedLibXdmGreet
>+# define SharedLibXdmGreet        NO
>+#endif
>+
>+/*
>+ * On FreeBSD, the run-time loader will use the built-in "rpath" before
>+ * LD_LIBRARY_PATH.  This means that utilities like mkfontdir will load
>+ * installed libraries (if they exist) in preference to the ones in the
>+ * build tree, even though LD_LIBRARY_PATH points to the build tree.
>+ * This can result in the build failing.  One way to avoid this is to
>+ * pre-load the libraries from the build tree.
>+ *
>+ * There should be a better way than this hack...
>+ */
>+#if UseElfFormat
>+#ifndef PreloadFontSetup
>+#define PreloadFontSetup        LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(XFONTPRELOADPATTERN))`"
>+#endif
>+#ifndef PreloadFreetypeSetup
>+#define PreloadFreetypeSetup    LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(FT2PRELOADPATTERN))`"
>+#endif
>+#ifndef PreloadXFTSetup
>+#define PreloadXFTSetup         LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(FT2PRELOADPATTERN) $(XFTPRELOADPATTERN) $(XRENDERPRELOADPATTERN) $(FCPRELOADPATTERN))`"
>+#endif
>+#endif
>+
>+#ifndef HasCookieMaker
>+# define HasCookieMaker        YES
>+# define MkCookieCmd \
>+    'dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
>+#endif
>+
>+/*
>+ * A hack to work around an optimization problem with gcc 2.95.2 - 2.95.4
>+ */
>+#if (GccMajorVersion == 2 && GccMinorVersion == 95)
>+# define GccOptBug295
>+#endif
>+
>+#include <bsdLib.rules>
>+
>+#include <xorg.cf>
>+
>+
>Index: xc/config/cf/Imake.cf
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/Imake.cf,v
>retrieving revision 1.6
>diff -u -r1.6 Imake.cf
>--- xc/config/cf/Imake.cf	15 Nov 2004 15:06:52 -0000	1.6
>+++ xc/config/cf/Imake.cf	2 Mar 2005 03:39:19 -0000
>@@ -253,6 +253,33 @@
> #define KNetBSDArchitecture
> #endif
> 
>+#ifdef __DragonFly__
>+# define MacroIncludeFile <DragonFly.cf>
>+# define MacroFile DragonFly.cf
>+# undef __DragonFly__
>+# undef __FreeBSD__
>+# define DragonFlyArchitecture
>+# define FreeBSDArchitecture
>+# ifdef __i386__
>+#  define i386BsdArchitecture
>+#  define i386Architecture
>+#  undef i386
>+# endif
>+# ifdef __sparc64__
>+#  define Sparc64Architecture
>+#  undef __sparc64__
>+# endif
>+# ifdef __ia64__
>+#  define ia64Architecture
>+#  undef __ia64__
>+# endif
>+# ifdef __amd64__
>+#  define x86_64Architecture
>+#  undef __amd64__
>+#  undef __x86_64__
>+# endif
>+#endif /* __DragonFly__ */
>+
> #ifdef __FreeBSD__
> # define MacroIncludeFile <FreeBSD.cf>
> # define MacroFile FreeBSD.cf
>Index: xc/config/cf/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/Imakefile,v
>retrieving revision 1.5
>diff -u -r1.5 Imakefile
>--- xc/config/cf/Imakefile	15 Nov 2004 15:06:52 -0000	1.5
>+++ xc/config/cf/Imakefile	2 Mar 2005 03:39:20 -0000
>@@ -93,6 +93,7 @@
> Imake.cf \
> Amoeba.cf \
> DGUX.cf \
>+DragonFly.cf \
> FreeBSD.cf \
> Mips.cf \
> NetBSD.cf \
>Index: xc/config/imake/imake.c
>===================================================================
>RCS file: /cvs/xorg/xc/config/imake/imake.c,v
>retrieving revision 1.6
>diff -u -r1.6 imake.c
>--- xc/config/imake/imake.c	24 Feb 2005 15:31:09 -0000	1.6
>+++ xc/config/imake/imake.c	2 Mar 2005 03:39:25 -0000
>@@ -145,7 +145,7 @@
>  *	#include INCLUDE_IMAKEFILE
>  *	<add any global targets like 'clean' and long dependencies>
>  */
>-#if defined(__FreeBSD__) || defined(__NetBSD__)
>+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
> /* This needs to be before _POSIX_SOURCE gets defined */
> # include <sys/param.h>
> # include <sys/types.h>
>@@ -1020,7 +1020,7 @@
> }
> #endif
> 
>-#if defined(__OpenBSD__) 
>+#if defined(__OpenBSD__) || defined(__DragonFly__)
> static void
> get_stackprotector(FILE *inFile)
> {
>@@ -1351,6 +1351,7 @@
>      defined(__NetBSD__) || \
>      defined(__OpenBSD__) || \
>      defined(__FreeBSD__) || \
>+     defined(__DragonFly__) || \
>      defined(__APPLE__) || \
>      defined(__CYGWIN__) || \
>      defined(__MINGW32__) || \
>@@ -1690,7 +1691,7 @@
>       fprintf(inFile, "#define DefaultOSTeenyVersion 0\n");
>     }
> #endif /* EMX */
>-#if defined(__OpenBSD__)
>+#if defined(__OpenBSD__) || defined(__DragonFly__)
>   get_stackprotector(inFile);
> #endif
>   return FALSE;
>Index: xc/config/imake/imakemdep.h
>===================================================================
>RCS file: /cvs/xorg/xc/config/imake/imakemdep.h,v
>retrieving revision 1.8
>diff -u -r1.8 imakemdep.h
>--- xc/config/imake/imakemdep.h	19 Jan 2005 22:28:20 -0000	1.8
>+++ xc/config/imake/imakemdep.h	2 Mar 2005 03:39:28 -0000
>@@ -294,7 +294,7 @@
> #if defined(__386BSD__)
> #define DEFAULT_CPP "/usr/libexec/cpp"
> #endif
>-#if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__OpenBSD__)
>+#if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
> #define USE_CC_E
> #endif
> #if defined(__sgi) && defined(__ANSI_CPP__)
>@@ -357,8 +357,8 @@
> #endif
> #endif
> #if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
>-    defined(__FreeBSD__) || defined(MACH) || defined(linux) || \
>-    defined(__GNU__) || defined(__bsdi__) || defined(__GNUC__)
>+    defined(__FreeBSD__) || defined(__DragonFly__) || defined(MACH) || \
>+    defined(linux) || defined(__GNU__) || defined(__bsdi__) || defined(__GNUC__)
> # ifdef __i386__
> 	"-D__i386__",
> #  if defined(__GNUC__) && (__GNUC__ >= 3)
>@@ -836,14 +836,14 @@
> #  define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
> #  define DEFAULT_OS_TEENY_REV   "v %[0-9]" 
> /* # define DEFAULT_OS_NAME        "srm %[^\n]" */ /* Not useful on ISC */
>-# elif defined(__FreeBSD__) || defined(__OpenBSD__)
>+# elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
> /* BSD/OS too? */
> /* uname -r returns "x.y[.z]-mumble", e.g. "2.1.5-RELEASE" or "2.2-0801SNAP" */
> #  define DEFAULT_OS_MAJOR_REV   "r %[0-9]"
> #  define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
> #  define DEFAULT_OS_TEENY_REV   "r %*d.%*d.%[0-9]" 
> #  define DEFAULT_OS_NAME        "srm %[^\n]"
>-#  if defined(__FreeBSD__)
>+#  if defined(__FreeBSD__) || defined(__DragonFly__)
> /* Use an alternate way to find the teeny version for -STABLE, -SNAP versions */
> #   ifndef CROSSCOMPILE_CPP
> #    define DEFAULT_OS_TEENY_REV_FROB(buf, size)			\
>@@ -1257,6 +1257,9 @@
> #ifdef _MIPS_SZPTR
> 	{"_MIPS_SZPTR", DEF_STRINGIFY(_MIPS_SZPTR)},
> #endif
>+#ifdef __DragonFly__
>+	{"__DragonFly__", "1"},
>+#endif
> #ifdef __FreeBSD__
> 	{"__FreeBSD__", "1"},
> #endif
>@@ -1438,7 +1441,8 @@
>   netBSD,
>   LinuX,
>   emx,
>-  win32
>+  win32,
>+  dragonfly
> } System;
> 
> #   ifdef linux
>@@ -1451,6 +1455,8 @@
> System sys = emx;
> #   elif defined WIN32
> System sys = win32;
>+#   elif defined __DragonFly__
>+System sys = dragonfly;
> #   else
> System sys = unknown;
> #   endif
>Index: xc/extras/drm/shared/drm.h
>===================================================================
>RCS file: /cvs/xorg/xc/extras/drm/shared/drm.h,v
>retrieving revision 1.1.1.1
>diff -u -r1.1.1.1 drm.h
>--- xc/extras/drm/shared/drm.h	16 Jun 2004 09:16:06 -0000	1.1.1.1
>+++ xc/extras/drm/shared/drm.h	2 Mar 2005 03:39:37 -0000
>@@ -46,7 +46,7 @@
> #define DRM_IOC_WRITE		_IOC_WRITE
> #define DRM_IOC_READWRITE	_IOC_READ|_IOC_WRITE
> #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
>-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
>+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
> #if defined(__FreeBSD__) && defined(IN_MODULE)
> /* Prevent name collision when including sys/ioccom.h */
> #undef ioctl
>Index: xc/include/Xos_r.h
>===================================================================
>RCS file: /cvs/xorg/xc/include/Xos_r.h,v
>retrieving revision 1.2
>diff -u -r1.2 Xos_r.h
>--- xc/include/Xos_r.h	23 Apr 2004 18:43:05 -0000	1.2
>+++ xc/include/Xos_r.h	2 Mar 2005 03:39:47 -0000
>@@ -257,7 +257,7 @@
>  */
> 
> #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
>-    defined(__APPLE__)
>+    defined(__APPLE__) || defined(__DragonFly__)
> static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
> {
>    memcpy(&(p).pws, (p).pwp, sizeof(struct passwd));
>@@ -427,7 +427,7 @@
> /* UnixWare 2.0, or other systems with thread support but no _r API. */
> /* WARNING:  The h_addr_list and s_aliases values are *not* copied! */
> 
>-#if defined(__NetBSD__) || defined(__FreeBSD__)
>+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
> #include <sys/param.h>
> #endif
> 
>Index: xc/lib/xtrans/Xtranssock.c
>===================================================================
>RCS file: /cvs/xorg/xc/lib/xtrans/Xtranssock.c,v
>retrieving revision 1.3
>diff -u -r1.3 Xtranssock.c
>--- xc/lib/xtrans/Xtranssock.c	15 Nov 2004 15:06:56 -0000	1.3
>+++ xc/lib/xtrans/Xtranssock.c	2 Mar 2005 03:39:57 -0000
>@@ -91,10 +91,10 @@
> #if defined(__osf__) || defined(linux) || defined(AIXV5)
> #include <sys/param.h>
> #endif /* osf */
>-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) 
>+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
> #include <sys/param.h>
> #include <machine/endian.h>
>-#endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ */
>+#endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ || __DragonFly__ */
> #include <netinet/tcp.h>
> #endif /* !NO_TCP_H */
> 
>Index: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v
>retrieving revision 1.4
>diff -u -r1.4 xf86_OSlib.h
>--- xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h	28 Jul 2004 03:57:19 -0000	1.4
>+++ xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h	2 Mar 2005 03:40:07 -0000
>@@ -440,7 +440,7 @@
> #   endif
> #   ifdef SYSCONS_SUPPORT
> #    define COMPAT_SYSCONS
>-#    if defined(__NetBSD__) || defined(__OpenBSD__)
>+#    if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
> #     include <machine/console.h>
> #    else
> #     if defined(__FreeBSD__)
>@@ -459,7 +459,7 @@
> #   if defined(PCVT_SUPPORT)
> #    if !defined(SYSCONS_SUPPORT)
>       /* no syscons, so include pcvt specific header file */
>-#     if defined(__FreeBSD__)
>+#     if defined(__FreeBSD__) || defined(__DragonFly__)
> #      include <machine/pcvt_ioctl.h>
> #     else
> #      if defined(__NetBSD__) || defined(__OpenBSD__)
>Index: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v
>retrieving revision 1.2
>diff -u -r1.2 xf86_libc.h
>--- xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h	23 Apr 2004 19:54:07 -0000	1.2
>+++ xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h	2 Mar 2005 03:40:09 -0000
>@@ -569,7 +569,9 @@
> #define open			xf86open
> #define close(a)		xf86close(a)
> #define lseek(a,b,c)		xf86lseek(a,b,c)
>+#if !defined(__DragonFly__)
> #define ioctl(a,b,c)		xf86ioctl(a,b,c)
>+#endif
> #define read(a,b,c)		xf86read(a,b,c)
> #define write(a,b,c)		xf86write(a,b,c)
> #define mmap(a,b,c,d,e,f)	xf86mmap(a,b,c,d,e,f)
>Index: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v
>retrieving revision 1.3
>diff -u -r1.3 lnx_agp.c
>--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c	4 Dec 2004 00:43:10 -0000	1.3
>+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c	2 Mar 2005 03:40:10 -0000
>@@ -18,7 +18,7 @@
> #if defined(linux)
> #include <asm/ioctl.h>
> #include <linux/agpgart.h>
>-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
>+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
> #include <sys/ioctl.h>
> #include <sys/agpio.h>
> #endif
>Index: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c,v
>retrieving revision 1.3
>diff -u -r1.3 xf86drmCompat.c
>--- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c	16 Jun 2004 09:39:15 -0000	1.3
>+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c	2 Mar 2005 03:40:11 -0000
>@@ -78,7 +78,7 @@
> #include "r128_drm.h"
> #include <inttypes.h>		/* for int64_t & friends */
> #include "radeon_drm.h"
>-#ifndef __FreeBSD__
>+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
> #include "sis_drm.h"
> #include "i810_drm.h"
> #include "i830_drm.h"
>@@ -89,7 +89,7 @@
>  * extensions used before XFree86 4.3.
>  */
> 
>-#ifndef __FreeBSD__
>+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
> /* I810 */
> 
> Bool drmI810CleanupDma(int driSubFD)
>@@ -1013,7 +1013,7 @@
>    }
> }
> 
>-#ifndef __FreeBSD__
>+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
> /* SiS */
> 
> Bool drmSiSAgpInit(int driSubFD, int offset, int size)

Actions: View | Splinter Review

Attachments on bug 1712: 1168 | 1169 | 1170 | 1171 | 1172 | 1280 | 2001 | 2004

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.