summaryrefslogtreecommitdiff
path: root/Xfuncs.h
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:48:42 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:48:42 +0000
commit5ec315b967cb1ae519f514896f0b48fb5407f863 (patch)
treee4e72bdbe972af362cebc19b9e1b02a4767a04ee /Xfuncs.h
parentf2001f5bd5316842106a98b23f09400688575fa3 (diff)
XFree86 4.3.0.1
Diffstat (limited to 'Xfuncs.h')
-rw-r--r--Xfuncs.h32
1 files changed, 15 insertions, 17 deletions
diff --git a/Xfuncs.h b/Xfuncs.h
index e535082..4ea2c3f 100644
--- a/Xfuncs.h
+++ b/Xfuncs.h
@@ -25,6 +25,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.10 2002/05/31 18:45:38 dawes Exp $ */
#ifndef _XFUNCS_H_
#define _XFUNCS_H_
@@ -32,34 +33,25 @@ in this Software without prior written authorization from The Open Group.
#include <X11/Xosdefs.h>
/* the old Xfuncs.h, for pre-R6 */
+#if !(defined(XFree86LOADER) && defined(IN_MODULE))
#ifdef X_USEBFUNCS
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_)
+#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
#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
-#include <memory.h>
-void bcopy();
-#define bzero(b,len) memset(b, 0, len)
-#define bcmp(b1,b2,len) memcmp(b1, b2, len)
-#else /* bsd */
-void bcopy();
-void bzero();
-int bcmp();
-#endif /* SYSV */
-#endif /* sgi */
-#endif /* __STDC__ and relatives */
+#endif
#endif /* X_USEBFUNCS */
/* the new Xfuncs.h */
@@ -87,4 +79,10 @@ int bcmp();
#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
+
+#endif /* !(defined(XFree86LOADER) && defined(IN_MODULE)) */
+
#endif /* _XFUNCS_H_ */