merge XFree86 RC2 (4.3.99.902) from vendor branchXEVIE-BASE

3 files changed, 27 insertions, 4 deletions

diff --git a/Xfuncs.h b/Xfuncs.h
index 4ea2c3f..e34b88b 100644
--- a/Xfuncs.h
+++ b/Xfuncs.h
@@ -1,4 +1,5 @@
 /*
+ * $XdotOrg: Xfuncs.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $
  * $Xorg: Xfuncs.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $
  * 
  * 
@@ -25,7 +26,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  *
  */
-/* $XFree86: xc/include/Xfuncs.h,v 3.10 2002/05/31 18:45:38 dawes Exp $ */
+/* $XFree86: xc/include/Xfuncs.h,v 3.11 2003/12/19 02:05:37 dawes Exp $ */
 
 #ifndef _XFUNCS_H_
 #define _XFUNCS_H_
@@ -40,13 +41,16 @@ void bcopy();
 void bzero();
 int bcmp();
 #else
-#if defined(SYSV)
+#if defined(SYSV) && !defined(SCO325)
 #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
+#include <strings.h>
+#endif
 #define _XFUNCS_H_INCLUDED_STRING_H
 #define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
 #define bzero(b,len) memset(b, 0, (size_t)(len))
diff --git a/Xos.h b/Xos.h
index 7de76a4..3810082 100644
--- a/Xos.h
+++ b/Xos.h
@@ -1,4 +1,5 @@
 /*
+ * $XdotOrg: Xos.h,v 1.6 2001/02/09 02:03:22 xorgcvs Exp $
  * $Xorg: Xos.h,v 1.6 2001/02/09 02:03:22 xorgcvs Exp $
  * 
  * 
@@ -27,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.39 2003/03/25 04:18:07 dawes Exp $ */
+/* $XFree86: xc/include/Xos.h,v 3.41 2003/12/19 02:05:37 dawes Exp $ */
 
 /* This is a collection of things to try and minimize system dependencies
  * in a "signficant" number of source files.
@@ -60,6 +61,10 @@ in this Software without prior written authorization from The Open Group.
 #endif
 #endif /* USG */
 
+#if defined(SCO325) || defined(__USLC__)
+#include <stdint.h>
+#endif
+
 #ifdef _SEQUENT_
 /*
  * in_systm.h compatibility between SysV and BSD types u_char u_short u_long
@@ -85,6 +90,9 @@ in this Software without prior written authorization from The Open Group.
 #ifndef X_NOT_STDC_ENV
 
 #include <string.h>
+#ifdef SCO325
+#include <strings.h>
+#else
 #ifdef __STDC__
 #ifndef index
 #define index(s,c) (strchr((s),(c)))
@@ -100,6 +108,7 @@ in this Software without prior written authorization from The Open Group.
 #define rindex strrchr
 #endif
 #endif
+#endif
 
 #else
 
diff --git a/Xosdefs.h b/Xosdefs.h
index d4700bc..bdf2376 100644
--- a/Xosdefs.h
+++ b/Xosdefs.h
@@ -1,6 +1,7 @@
 /*
  * O/S-dependent (mis)feature macro definitions
  *
+ * $XdotOrg: Xosdefs.h,v 1.5 2001/02/09 02:03:23 xorgcvs Exp $
  * $Xorg: Xosdefs.h,v 1.5 2001/02/09 02:03:23 xorgcvs Exp $
  *
 Copyright 1991, 1998  The Open Group
@@ -25,7 +26,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  */
-/* $XFree86: xc/include/Xosdefs.h,v 3.20 2002/05/31 18:45:39 dawes Exp $ */
+/* $XFree86: xc/include/Xosdefs.h,v 3.21 2003/12/18 16:38:34 dawes Exp $ */
 
 #ifndef _XOSDEFS_H_
 #define _XOSDEFS_H_
@@ -79,6 +80,15 @@ in this Software without prior written authorization from The Open Group.
 #endif
 #endif
 
+#ifdef _SCO_DS
+#ifndef SCO
+#define SCO
+#endif
+#ifndef SCO325
+#define SCO325
+#endif
+#endif
+
 #ifdef i386
 #ifdef SYSV
 #if !defined(ISC) && !defined(SCO) && !defined(_SEQUENT_)