diff options
Diffstat (limited to 'X11/Xfuncs.h')
| -rw-r--r-- | X11/Xfuncs.h | 81 |
1 files changed, 26 insertions, 55 deletions
diff --git a/X11/Xfuncs.h b/X11/Xfuncs.h index 2469b69a9..354b66326 100644 --- a/X11/Xfuncs.h +++ b/X11/Xfuncs.h @@ -1,7 +1,4 @@ /* - * $XdotOrg: xc/include/Xfuncs.h,v 1.2 2004/04/23 18:43:05 eich Exp $ - * $Xorg: Xfuncs.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ - * * Copyright 1990, 1998 The Open Group @@ -26,73 +23,47 @@ 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.10 2002/05/31 18:45:38 dawes Exp $ */ #ifndef _XFUNCS_H_ -#define _XFUNCS_H_ +# define _XFUNCS_H_ -#include <X11/Xosdefs.h> +# include <X11/Xosdefs.h> /* the old Xfuncs.h, for pre-R6 */ -#if !(defined(XFree86LOADER) && defined(IN_MODULE)) +# if !(defined(XFree86LOADER) && defined(IN_MODULE)) -#ifdef X_USEBFUNCS +# ifdef X_USEBFUNCS void bcopy(); void bzero(); int bcmp(); -#else -#if defined(SYSV) && !defined(__SCO__) && !defined(sun) && !defined(__UNIXWARE__) -#include <memory.h> +# else +# if defined(SYSV) && !defined(__SCO__) && !defined(__sun) && !defined(__UNIXWARE__) +# 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> -#if defined(__SCO__) || defined(sun) || defined(__UNIXWARE__) -#include <strings.h> -#endif -#define _XFUNCS_H_INCLUDED_STRING_H -#if defined(sun) -#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 -#endif /* X_USEBFUNCS */ +# define bzero(b,len) memset(b, 0, len) +# define bcmp(b1,b2,len) memcmp(b1, b2, len) +# else +# include <string.h> +# if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__) +# include <strings.h> +# endif +# define _XFUNCS_H_INCLUDED_STRING_H +# endif +# endif /* X_USEBFUNCS */ /* the new Xfuncs.h */ -#if !defined(X_NOT_STDC_ENV) && (!defined(sun) || defined(SVR4)) /* the ANSI C way */ -#ifndef _XFUNCS_H_INCLUDED_STRING_H -#include <string.h> -#endif -#undef bzero -#define bzero(b,len) memset(b,0,len) -#else /* else X_NOT_STDC_ENV or SunOS 4 */ -#if defined(SYSV) || defined(luna) || defined(sun) || defined(__sxg__) -#include <memory.h> -#define memmove(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len)) -#if defined(SYSV) && defined(_XBCOPYFUNC) -#undef memmove -#define memmove(dst,src,len) _XBCOPYFUNC((char *)(src),(char *)(dst),(int)(len)) -#define _XNEEDBCOPYFUNC -#endif -#else /* else vanilla BSD */ -#define memmove(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len)) -#define memcpy(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len)) -#define memcmp(b1,b2,len) bcmp((char *)(b1),(char *)(b2),(int)(len)) -#endif /* SYSV else */ -#endif /* ! X_NOT_STDC_ENV else */ - -#if defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)) -#define atexit(f) on_exit(f, 0) -#endif +# ifndef _XFUNCS_H_INCLUDED_STRING_H +# include <string.h> +# endif +# undef bzero +# define bzero(b,len) memset(b,0,len) -#if defined WIN32 && defined __MINGW32__ -#define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len)) -#endif +# if defined WIN32 && defined __MINGW32__ +# define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len)) +# endif -#endif /* !(defined(XFree86LOADER) && defined(IN_MODULE)) */ +# endif /* !(defined(XFree86LOADER) && defined(IN_MODULE)) */ #endif /* _XFUNCS_H_ */ |