summaryrefslogtreecommitdiff
path: root/Xfuncs.h
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2009-06-12 11:55:37 -0400
committerAdam Jackson <ajax@redhat.com>2009-06-12 12:21:12 -0400
commitced38e880b54f2aae31a5354aecb4235a129f0a4 (patch)
treed08cc75859c1508e7d0c157b84436e20c3d2fb19 /Xfuncs.h
parent3fc87608d4b3f85d0dbd44ee9040d5ab60130bea (diff)
downloadxorg-proto-x11proto-ced38e880b54f2aae31a5354aecb4235a129f0a4.tar.gz
Remove all trace of X_NOT_STDC_ENV (#6527)
Seriously C89 already you guys.
Diffstat (limited to 'Xfuncs.h')
-rw-r--r--Xfuncs.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/Xfuncs.h b/Xfuncs.h
index 2265910..6acc01e 100644
--- a/Xfuncs.h
+++ b/Xfuncs.h
@@ -58,14 +58,14 @@ void bcopy();
/* the new Xfuncs.h */
-#if !defined(X_NOT_STDC_ENV) && (!defined(sun) || defined(SVR4))
+#if (!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 */
+#else
#if defined(SYSV) || defined(luna) || defined(sun) || defined(__sxg__)
#include <memory.h>
#define memmove(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len))
@@ -79,9 +79,9 @@ void bcopy();
#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 */
+#endif
-#if defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4))
+#if (defined(sun) && !defined(SVR4))
#define atexit(f) on_exit(f, 0)
#endif