Import most of XFree86 4.4RC3. This import excludes files which have the

new license. If we want to, later we can import 4.4RC3 again and pick
    up the files that have the new license, but for now the vendor branch
    is "pure."
This commit is contained in:
Kaleb Keithley 2004-02-23 20:35:22 +00:00
commit 4ee0a53de8
35 changed files with 984 additions and 266 deletions

View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.105 2003/12/18 21:56:37 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.106 2004/02/02 03:55:28 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
*
@ -58,6 +58,10 @@
# define _COMPILER_H
#if defined(__SUNPRO_C)
# define DO_PROTOTYPES
#endif
/* Allow drivers to use the GCC-supported __inline__ and/or __inline. */
# ifndef __inline__
# if defined(__GNUC__)
@ -1296,6 +1300,7 @@ inl(unsigned short port)
# define mem_barrier() /* NOP */
# define write_mem_barrier() /* NOP */
# if !defined(__SUNPRO_C)
# if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__)
# ifdef GCCUSESGAS
@ -1441,6 +1446,7 @@ inl(unsigned short port)
}
# endif /* FAKEIT */
# endif /* __SUNPRO_C */
# endif /* ix86 */
@ -1537,7 +1543,7 @@ extern void outl(unsigned int a, unsigned int l);
# include <sys/types.h>
#endif
# ifndef __HIGHC__
# ifndef __USLC__
# if !defined(__USLC__) && !defined(__SUNPRO_C)
# define __USLC__
# endif
# endif
@ -1556,13 +1562,14 @@ extern void outl(unsigned int a, unsigned int l);
# include <sys/types.h>
# endif /* IN_MODULE */
# endif /* USL */
# ifndef sgi
# include <sys/inline.h>
# if !defined(sgi) && !defined(__SUNPRO_C)
# include <sys/inline.h>
# endif
# else
# include "scoasm.h"
# endif
# if !defined(__HIGHC__) && !defined(SCO325) && !defined(sgi)
# if !defined(__HIGHC__) && !defined(SCO325) && !defined(sgi) && \
!defined(__SUNPRO_C)
# pragma asm partial_optimization outl
# pragma asm partial_optimization outw
# pragma asm partial_optimization outb