diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:40 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:40 +0000 |
| commit | a4b29bd17ae57f76103d2aeb90659560741a67b9 (patch) | |
| tree | b8a8241378b752cbc7ef7041ac8100fedc7239c4 /src/authutil.c | |
| parent | ee452992357329f7af846eba8f5bbe61c5d27bfa (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'src/authutil.c')
| -rw-r--r-- | src/authutil.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/authutil.c b/src/authutil.c index 64ad848..abdbf44 100644 --- a/src/authutil.c +++ b/src/authutil.c @@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ +/* $XFree86: xc/lib/ICE/authutil.c,v 3.9 2002/05/31 18:45:41 dawes Exp $ */ #include <X11/ICE/ICElib.h> #include "ICElibint.h" @@ -34,14 +35,11 @@ Author: Ralph Mor, X Consortium #include <sys/stat.h> #include <errno.h> -#ifdef X_NOT_STDC_ENV -extern int errno; -extern long time (); -extern char *getenv(); -#define Time_t long -#else #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> @@ -77,7 +75,7 @@ IceAuthFileName () static char *buf; static int bsize; int size; -#ifdef WIN32 +#if defined(WIN32) || defined(__UNIXOS2__) #ifndef PATH_MAX #define PATH_MAX 512 #endif @@ -109,6 +107,11 @@ IceAuthFileName () } if (!name) #endif +#ifdef __UNIXOS2__ + strcpy (dir,"c:"); + name = dir; + if (!name) +#endif return (NULL); } |