diff options
author | Kean Johnson <kean@armory.com> | 2005-06-10 06:54:02 +0000 |
---|---|---|
committer | Kean Johnson <kean@armory.com> | 2005-06-10 06:54:02 +0000 |
commit | dd37edab7cc408b9f7d08a50d927567471c985d4 (patch) | |
tree | 015a9b7fe4db8962d2c43e69317ec830a02767dd | |
parent | a870c60741273ebd6cb1e69b4e535ce3a6bc76bf (diff) | |
download | xorg-proto-x11proto-sco_port_update.tar.gz |
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.
-rw-r--r-- | Xfuncs.h | 4 | ||||
-rw-r--r-- | Xos.h | 6 | ||||
-rw-r--r-- | Xosdefs.h | 12 | ||||
-rw-r--r-- | Xthreads.h | 5 |
4 files changed, 14 insertions, 13 deletions
@@ -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 @@ -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)) @@ -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 @@ -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) |