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 /Xfuncs.h | |
| parent | e88a09c1df46637979c4d131a8e41af923ff4d45 (diff) | |
| download | xorg-proto-x11proto-5b67de2bce0e33a4a85439ebcf7b726a6da24545.tar.gz | |
Merging XORG-CURRENT into trunkXORG-6_7_99_1XACE-SELINUX-MERGECOMPOSITEWRAP
Diffstat (limited to 'Xfuncs.h')
| -rw-r--r-- | Xfuncs.h | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1,4 +1,5 @@ /* + * $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 $ * * @@ -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.11 2003/12/19 02:05:37 dawes Exp $ */ +/* $XFree86: xc/include/Xfuncs.h,v 3.10 2002/05/31 18:45:38 dawes Exp $ */ #ifndef _XFUNCS_H_ #define _XFUNCS_H_ @@ -40,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 |