xc/config/cf/DragonFly.cf

xc/config/cf/Imake.cf
xc/config/cf/Imakefile
xc/config/imake/imake.c
xc/config/imake/imakemdep.h
xc/extras/drm/shared/drm.h
xc/include/Xos_r.h
xc/lib/xtrans/Xtranssock.c
xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c
//bugs.freedesktop.org/show_bug.cgi?id=1712) attachment #2004
    (https://bugs.freedesktop.org/attachment.cgi?id=2004): Add support for
    DragonFly/BSD platform. Patch by Jeroen Ruigrok <asmodai@tendra.org>
    and Mike Verona <firedragonfly@gmail.com>.
This commit is contained in:
Roland Mainz 2005-03-02 11:20:30 +00:00
parent 6c6151b233
commit 3f79c5eefc
3 changed files with 19 additions and 8 deletions

View File

@ -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

View File

@ -67,7 +67,7 @@
*/
/* $XConsortium: xf86_OSlib.h /main/22 1996/10/27 11:06:31 kaleb $ */
/* $XdotOrg: $ */
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 1.4 2004/07/28 03:57:19 alanc Exp $ */
/*
* This is private, and should not be included by any drivers. Drivers
@ -440,7 +440,7 @@ extern int errno;
# 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 @@ extern int errno;
# 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__)

View File

@ -1,4 +1,5 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 3.57 2003/08/24 17:37:03 dawes Exp $ */
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 1.2 2004/04/23 19:54:07 eich Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 3.63 2003/12/08 21:46:55 alanh Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
*
@ -96,7 +97,11 @@ struct xf86stat {
typedef int xf86key_t;
/* setjmp/longjmp */
#if defined(__ia64__)
typedef int xf86jmp_buf[1024] __attribute__ ((aligned (16))); /* guarantees 128-bit alignment! */
#else
typedef int xf86jmp_buf[1024];
#endif
/* for setvbuf */
#define XF86_IONBF 1
@ -373,6 +378,10 @@ typedef int xf86jmp_buf[1024];
#define strcspn(ccp1,ccp2) xf86strcspn(ccp1,ccp2)
#undef strerror
#define strerror(i) xf86strerror(i)
#undef strlcat
#define strlcat(cp,ccp,I) xf86strlcat(cp,ccp,I)
#undef strlcpy
#define strlcpy(cp,ccp,I) xf86strlcpy(cp,ccp,I)
#undef strlen
#define strlen(ccp) xf86strlen(ccp)
#undef strncmp
@ -410,11 +419,11 @@ typedef int xf86jmp_buf[1024];
#undef ungetc
#define ungetc(i,FP) xf86ungetc(i,FP)
#undef vfprinf
#define vfprintf xf86vfprintf
#define vfprintf(p,f,a) xf86vfprintf(p,f,a)
#undef vsnprintf
#define vsnprintf xf86vsnprintf
#define vsnprintf(s,n,f,a) xf86vsnprintf(s,n,f,a)
#undef vsprintf
#define vsprintf xf86vsprintf
#define vsprintf(s,f,a) xf86vsprintf(s,f,a)
/* XXX Disable assert as if NDEBUG was defined */
/* Some X headers defined this away too */
#undef assert
@ -560,7 +569,9 @@ typedef int xf86jmp_buf[1024];
#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)