diff options
Diffstat (limited to 'xc/include/Xfuncs.h')
| -rw-r--r-- | xc/include/Xfuncs.h | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/xc/include/Xfuncs.h b/xc/include/Xfuncs.h index 5088df6a8..0631e582a 100644 --- a/xc/include/Xfuncs.h +++ b/xc/include/Xfuncs.h @@ -21,7 +21,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.7 2001/01/17 17:53:11 dawes Exp $ */ +/* $XFree86: xc/include/Xfuncs.h,v 3.8 2001/07/25 15:04:42 dawes Exp $ */ #ifndef _XFUNCS_H_ #define _XFUNCS_H_ @@ -36,34 +36,22 @@ void bcopy(); void bzero(); int bcmp(); #else -#if (__STDC__ && !defined(X_NOT_STDC_ENV) && !defined(sun) && !defined(macII) && !defined(apollo)) || defined(SVR4) || defined(hpux) || defined(_IBMR2) || defined(_SEQUENT_) -#include <string.h> -#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)) -#define bcmp(b1,b2,len) memcmp(b1, b2, (size_t)(len)) -#else -#ifdef sgi -#include <bstring.h> -#else -#ifdef SYSV +#if defined(SYSV) #include <memory.h> void bcopy(); #define bzero(b,len) memset(b, 0, len) #define bcmp(b1,b2,len) memcmp(b1, b2, len) -#else -#ifdef __EMX__ +#elif defined(__EMX__) #include <strings.h> -#define _XFUNCS_H_INCLUDED_STRING_H /* bcopy, bcmp, bzero declared */ -#else /* bsd */ -void bcopy(); -void bzero(); -int bcmp(); +#define _XFUNCS_H_INCLUDED_STRING_H +#else +#include <string.h> +#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)) +#define bcmp(b1,b2,len) memcmp(b1, b2, (size_t)(len)) #endif -#endif /* SYSV */ -#endif /* sgi */ -#endif /* __STDC__ and relatives */ #endif /* X_USEBFUNCS */ /* the new Xfuncs.h */ |