diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:05 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:05 +0000 |
| commit | 5b67de2bce0e33a4a85439ebcf7b726a6da24545 (patch) | |
| tree | f3a589f35ab4d1e0a89f41177faa8d6b4d8607a3 /Xos.h | |
| parent | e88a09c1df46637979c4d131a8e41af923ff4d45 (diff) | |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'Xos.h')
| -rw-r--r-- | Xos.h | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,4 +1,5 @@ /* + * $XdotOrg: xc/include/Xos.h,v 1.1.4.4 2004/02/16 20:55:02 alanc 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.42 2003/12/31 01:18:41 tsi Exp $ */ +/* $XFree86: xc/include/Xos.h,v 3.41tsi Exp $ */ /* This is a collection of things to try and minimize system dependencies * in a "signficant" number of source files. @@ -94,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))) |