diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-01 13:44:11 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-01 13:44:11 +0000 |
| commit | aff79ec2a7959cdba70a59906064afdfce063144 (patch) | |
| tree | 8022f476c64c7eeae9bec825180868dec93f96cc | |
| parent | 10c022d957b17320d71138d2bf52d6ff704308a0 (diff) | |
| download | xorg-proto-x11proto-XEVIE.tar.gz | |
3. Added missing parts to XKB to make XEVIE branch compile (Egbert Eich).XEVIE
2. Merged with XORG-CURRENT branch to obtain a bugfix (Egbert Eich).
1. First add of SUN's XIVIE extension (Stuart Kreitman).
| -rw-r--r-- | Xfuncs.h | 6 | ||||
| -rw-r--r-- | Xos.h | 9 |
2 files changed, 10 insertions, 5 deletions
@@ -1,5 +1,5 @@ /* - * $XdotOrg: Xfuncs.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ + * $XdotOrg: xc/include/Xfuncs.h,v 1.1.4.3 2004/02/16 20:55:02 alanc Exp $ * $Xorg: Xfuncs.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ * * @@ -41,14 +41,14 @@ void bcopy(); void bzero(); int bcmp(); #else -#if defined(SYSV) && !defined(SCO325) +#if defined(SYSV) && !defined(SCO325) && !defined(sun) #include <memory.h> void bcopy(); #define bzero(b,len) memset(b, 0, len) #define bcmp(b1,b2,len) memcmp(b1, b2, len) #else #include <string.h> -#ifdef SCO325 +#if defined(SCO325) || defined(sun) #include <strings.h> #endif #define _XFUNCS_H_INCLUDED_STRING_H @@ -1,5 +1,5 @@ /* - * $XdotOrg: Xos.h,v 1.6 2001/02/09 02:03:22 xorgcvs Exp $ + * $XdotOrg: xc/include/Xos.h,v 1.1.4.5 2004/02/23 21:33:46 kaleb Exp $ * $Xorg: Xos.h,v 1.6 2001/02/09 02:03:22 xorgcvs Exp $ * * @@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group. * The X Window System is a Trademark of The Open Group. * */ -/* $XFree86: xc/include/Xos.h,v 3.41 2003/12/19 02:05:37 dawes Exp $ */ +/* $XFree86: xc/include/Xos.h,v 3.42 2003/12/31 01:18:41 tsi Exp $ */ /* This is a collection of things to try and minimize system dependencies * in a "signficant" number of source files. @@ -61,9 +61,11 @@ in this Software without prior written authorization from The Open Group. #endif #endif /* USG */ +#ifndef sgi #if defined(SCO325) || defined(__USLC__) #include <stdint.h> #endif +#endif #ifdef _SEQUENT_ /* @@ -93,6 +95,9 @@ in this Software without prior written authorization from The Open Group. #ifdef SCO325 #include <strings.h> #else +#if (defined(sun) && defined(__SVR4)) +#include <strings.h> +#endif #ifdef __STDC__ #ifndef index #define index(s,c) (strchr((s),(c))) |