SCO port update for SCO OpenServer 5 and UnixWare 7. A few general cleanupssco_port_update

    and bugs not specifically related to the port fixed along the way.

4 files changed, 14 insertions, 13 deletions

diff --git a/Xfuncs.h b/Xfuncs.h
index 02c0e17..4bdb85f 100644
--- a/Xfuncs.h
+++ b/Xfuncs.h
@@ -41,14 +41,14 @@ void bcopy();
 void bzero();
 int bcmp();
 #else
-#if defined(SYSV) && !defined(SCO325) && !defined(sun)
+#if defined(SYSV) && !defined(__SCO__) && !defined(sun)
 #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)
 #include <strings.h>
 #endif
 #define _XFUNCS_H_INCLUDED_STRING_H
diff --git a/Xos.h b/Xos.h
index 43141ba..4fd1c53 100644
--- a/Xos.h
+++ b/Xos.h
@@ -61,11 +61,9 @@ in this Software without prior written authorization from The Open Group.
 #endif
 #endif /* USG */
 
-#ifndef sgi
-#if defined(SCO325) || defined(__USLC__)
+#if defined(__SCO__) || defined(__UNIXWARE__)
 #include <stdint.h>
 #endif
-#endif
 
 #ifdef _SEQUENT_
 /*
@@ -92,7 +90,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef X_NOT_STDC_ENV
 
 #include <string.h>
-#ifdef SCO325
+#ifdef __SCO__
 #include <strings.h>
 #else
 #if (defined(sun) && defined(__SVR4))
diff --git a/Xosdefs.h b/Xosdefs.h
index 5b31a2d..2492f2a 100644
--- a/Xosdefs.h
+++ b/Xosdefs.h
@@ -81,18 +81,16 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 #ifdef _SCO_DS
-#ifndef SCO
-#define SCO
-#endif
-#ifndef SCO325
-#define SCO325
+#ifndef __SCO__
+#define __SCO__
 #endif
 #endif
 
 #ifdef i386
 #ifdef SYSV
-#if !defined(ISC) && !defined(SCO) && !defined(_SEQUENT_) && !defined(sun)
-#if !defined(_POSIX_SOURCE) && !defined(_SCO_DS)
+#if !defined(ISC) && !defined(__SCO__) && !defined(_SEQUENT_) && \
+	!defined(__UNIXWARE__) && !defined(sun)
+#if !defined(_POSIX_SOURCE)
 #define X_NOT_POSIX
 #endif
 #define X_NOT_STDC_ENV
diff --git a/Xthreads.h b/Xthreads.h
index aeec73c..f268949 100644
--- a/Xthreads.h
+++ b/Xthreads.h
@@ -70,7 +70,12 @@ typedef thread_t xthread_t;
 typedef thread_key_t xthread_key_t;
 typedef cond_t xcondition_rec;
 typedef mutex_t xmutex_rec;
+#if defined(__UNIXWARE__)
+extern xthread_t (*_x11_thr_self)();
+#define xthread_self (_x11_thr_self)
+#else
 #define xthread_self thr_self
+#endif
 #define xthread_fork(func,closure) thr_create(NULL,0,func,closure,THR_NEW_LWP|THR_DETACHED,NULL)
 #define xthread_yield() thr_yield()
 #define xthread_exit(v) thr_exit(v)