summaryrefslogtreecommitdiff
path: root/Xfuncs.h
diff options
context:
space:
mode:
authorKean Johnson <kean@armory.com>2005-11-08 06:33:25 +0000
committerKean Johnson <kean@armory.com>2005-11-08 06:33:25 +0000
commit448763bde4a31cb012ad17cd6c5159411102432b (patch)
tree8c76f983df87ad2f661c10143829095f25c101e5 /Xfuncs.h
parent59a5a5ebb6781d417d7a4d5905999da5fc76a083 (diff)
See ChangeLog entry 2005-11-07 for details.
Diffstat (limited to 'Xfuncs.h')
-rw-r--r--Xfuncs.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/Xfuncs.h b/Xfuncs.h
index 12a03ed..9fe8687 100644
--- a/Xfuncs.h
+++ b/Xfuncs.h
@@ -41,21 +41,23 @@ void bcopy();
void bzero();
int bcmp();
#else
-#if defined(SYSV) && !defined(SCO325) && !defined(sun)
+#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(SCO325) || defined(sun)
+#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 */
/* the new Xfuncs.h */