diff options
| author | monty@mashka.mysql.fi <> | 2003-01-28 09:02:51 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-28 09:02:51 +0200 |
| commit | 6b712793825955f37e27497b937f7c5cba0b71c6 (patch) | |
| tree | bbd008d05f1c1111676b46f092fde8257666d9c2 /mysys/my_tempnam.c | |
| parent | 52e440b9a784289bb1d502e9891c7250bf9b0b47 (diff) | |
| parent | 152f0603e7348ef58103ddf0c958a3373dd958bc (diff) | |
| download | mariadb-git-6b712793825955f37e27497b937f7c5cba0b71c6.tar.gz | |
merge
Diffstat (limited to 'mysys/my_tempnam.c')
| -rw-r--r-- | mysys/my_tempnam.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysys/my_tempnam.c b/mysys/my_tempnam.c index 4fa2dd2abc4..a652fae3574 100644 --- a/mysys/my_tempnam.c +++ b/mysys/my_tempnam.c @@ -38,7 +38,7 @@ #endif #ifdef HAVE_TEMPNAM -#if !defined( MSDOS) && !defined(OS2) +#if !defined( MSDOS) && !defined(OS2) && !defined(__NETWARE__) extern char **environ; #endif #endif @@ -104,14 +104,14 @@ my_string my_tempnam(const char *dir, const char *pfx, dir=temp; } #ifdef OS2 - // changing environ variable doesn't work with VACPP + /* changing environ variable doesn't work with VACPP */ char buffer[256]; sprintf( buffer, "TMP=%s", dir); - // remove ending backslash + /* remove ending backslash */ if (buffer[strlen(buffer)-1] == '\\') buffer[strlen(buffer)-1] = '\0'; putenv( buffer); -#else +#elif !defined(__NETWARE__) old_env=(char**)environ; if (dir) { /* Don't use TMPDIR if dir is given */ @@ -120,7 +120,7 @@ my_string my_tempnam(const char *dir, const char *pfx, } #endif res=tempnam((char*) dir,(my_string) pfx); /* Use stand. dir with prefix */ -#ifndef OS2 +#if !defined(OS2) && !defined(__NETWARE__) ((char**) environ)=(char**) old_env; #endif if (!res) |