diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-02-16 20:55:02 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-02-16 20:55:02 +0000 |
| commit | 79baa976cc84533c51dfc33e03fe2463bcc9dcd7 (patch) | |
| tree | a18c47b8879842969fe335f43bb5d16c104e9b94 | |
| parent | 10c022d957b17320d71138d2bf52d6ff704308a0 (diff) | |
| download | xorg-proto-x11proto-79baa976cc84533c51dfc33e03fe2463bcc9dcd7.tar.gz | |
Additional fixes for building on Solaris with Sun compilers
| -rw-r--r-- | Xfuncs.h | 6 | ||||
| -rw-r--r-- | Xos.h | 5 |
2 files changed, 7 insertions, 4 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.2 2003/12/20 00:28:21 kaleb 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.3 2003/12/20 00:28:21 kaleb Exp $ * $Xorg: Xos.h,v 1.6 2001/02/09 02:03:22 xorgcvs Exp $ * * @@ -93,6 +93,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))) |