[Xorg-commit] xc/include Xfuncs.h,1.1.4.2,1.1.4.3 Xos.h,1.1.4.3,1.1.4.4

[Alan Coopersmith]

Committed by: alanc

Update of /cvs/xorg/xc/include
In directory pdx:/tmp/cvs-serv31849/include

Modified Files:
      Tag: XORG-CURRENT
	Xfuncs.h Xos.h 
Log Message:
Additional fixes for building on Solaris with Sun compilers


Index: Xfuncs.h
===================================================================
RCS file: /cvs/xorg/xc/include/Xfuncs.h,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- Xfuncs.h	20 Dec 2003 00:28:21 -0000	1.1.4.2
+++ Xfuncs.h	16 Feb 2004 20:55:02 -0000	1.1.4.3
@@ -41,14 +41,14 @@
 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

Index: Xos.h
===================================================================
RCS file: /cvs/xorg/xc/include/Xos.h,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- Xos.h	20 Dec 2003 00:28:21 -0000	1.1.4.3
+++ Xos.h	16 Feb 2004 20:55:02 -0000	1.1.4.4
@@ -93,6 +93,9 @@
 #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)))