diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-01-04 19:32:08 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-01-04 19:32:08 -0800 |
| commit | e1677ce019219ac164d99f1e04f17caf16fc785a (patch) | |
| tree | 564d19a4329bc7ae7ebfe4567b7b0eec40e669a1 | |
| parent | f166e8bbf16ec214fefdcf02ce81f80442899cb7 (diff) | |
| download | xorg-lib-libICE-e1677ce019219ac164d99f1e04f17caf16fc785a.tar.gz | |
unifdef -U__UNIXOS2__
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | src/authutil.c | 11 | ||||
| -rw-r--r-- | src/globals.h | 6 | ||||
| -rw-r--r-- | src/iceauth.c | 2 | ||||
| -rw-r--r-- | src/setauth.c | 4 |
4 files changed, 1 insertions, 22 deletions
diff --git a/src/authutil.c b/src/authutil.c index 6c00482..ad29dbb 100644 --- a/src/authutil.c +++ b/src/authutil.c @@ -38,10 +38,6 @@ Author: Ralph Mor, X Consortium #include <time.h> #define Time_t time_t -#ifdef __UNIXOS2__ -extern char* getenv(const char*); -#define link rename -#endif #ifndef X_NOT_POSIX #include <unistd.h> #else @@ -75,7 +71,7 @@ IceAuthFileName (void) static char *buf; static int bsize; int size; -#if defined(WIN32) || defined(__UNIXOS2__) +#ifdef WIN32 #ifndef PATH_MAX #define PATH_MAX 512 #endif @@ -107,11 +103,6 @@ IceAuthFileName (void) } if (!name) #endif -#ifdef __UNIXOS2__ - strcpy (dir,"c:"); - name = dir; - if (!name) -#endif return (NULL); } diff --git a/src/globals.h b/src/globals.h index 965386f..a8b9e35 100644 --- a/src/globals.h +++ b/src/globals.h @@ -26,15 +26,9 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -#ifndef __UNIXOS2__ IceConn _IceConnectionObjs[256]; char *_IceConnectionStrings[256]; _IceProtocol _IceProtocols[255]; -#else -IceConn _IceConnectionObjs[256] = {0}; -char *_IceConnectionStrings[256] = {0}; -_IceProtocol _IceProtocols[255] = {0}; -#endif int _IceConnectionCount = 0; int _IceLastMajorOpcode = 0; diff --git a/src/iceauth.c b/src/iceauth.c index 14370e2..3c0f623 100644 --- a/src/iceauth.c +++ b/src/iceauth.c @@ -67,9 +67,7 @@ IceGenerateMagicCookie ( } #else { -#ifndef __UNIXOS2__ long time (); -#endif ldata[0] = time ((long *) 0); ldata[1] = getpid (); } diff --git a/src/setauth.c b/src/setauth.c index d190de5..2e9f882 100644 --- a/src/setauth.c +++ b/src/setauth.c @@ -50,11 +50,7 @@ Author: Ralph Mor, X Consortium */ int _IcePaAuthDataEntryCount = 0; -#ifndef __UNIXOS2__ IceAuthDataEntry _IcePaAuthDataEntries[ICE_MAX_AUTH_DATA_ENTRIES]; -#else -IceAuthDataEntry _IcePaAuthDataEntries[ICE_MAX_AUTH_DATA_ENTRIES] = {0}; -#endif void |