From a88f03e22f0ff2700824b5fb81f7ef498100b400 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@codeweavers.com>
Date: Tue, 8 Jan 2008 12:20:30 +0800
Subject: [PATCH] msvcrt: Rename _environ to avoid a conflict on Solaris.

---
 dlls/msvcrt/data.c      | 10 +++++-----
 dlls/msvcrt/environ.c   |  8 ++++----
 dlls/msvcrt/msvcrt.h    |  2 +-
 dlls/msvcrt/msvcrt.spec |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c
index 994e19b2367..fa53b85bd7d 100644
--- a/dlls/msvcrt/data.c
+++ b/dlls/msvcrt/data.c
@@ -50,7 +50,7 @@ char **MSVCRT___argv;
 MSVCRT_wchar_t **MSVCRT___wargv;
 char *MSVCRT__acmdln;
 MSVCRT_wchar_t *MSVCRT__wcmdln;
-char **_environ = 0;
+char **MSVCRT__environ = 0;
 MSVCRT_wchar_t **_wenviron = 0;
 char **MSVCRT___initenv = 0;
 MSVCRT_wchar_t **MSVCRT___winitenv = 0;
@@ -203,9 +203,9 @@ MSVCRT_wchar_t*** CDECL __p___wargv(void) { return &MSVCRT___wargv; }
  */
 char*** CDECL __p__environ(void)
 {
-  if (!_environ)
-    _environ = msvcrt_SnapshotOfEnvironmentA(NULL);
-  return &_environ;
+  if (!MSVCRT__environ)
+    MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(NULL);
+  return &MSVCRT__environ;
 }
 
 /*********************************************************************
@@ -302,7 +302,7 @@ void msvcrt_free_args(void)
   /* FIXME: more things to free */
   HeapFree(GetProcessHeap(), 0, MSVCRT___initenv);
   HeapFree(GetProcessHeap(), 0, MSVCRT___winitenv);
-  HeapFree(GetProcessHeap(), 0, _environ);
+  HeapFree(GetProcessHeap(), 0, MSVCRT__environ);
   HeapFree(GetProcessHeap(), 0, _wenviron);
   HeapFree(GetProcessHeap(), 0, MSVCRT__pgmptr);
   HeapFree(GetProcessHeap(), 0, MSVCRT__wpgmptr);
diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c
index 886d19f722a..44f201a0643 100644
--- a/dlls/msvcrt/environ.c
+++ b/dlls/msvcrt/environ.c
@@ -105,8 +105,8 @@ int CDECL _putenv(const char *str)
  if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0;
 
  /* Update the __p__environ array only when already initialized */
- if (_environ)
-   _environ = msvcrt_SnapshotOfEnvironmentA(_environ);
+ if (MSVCRT__environ)
+   MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ);
  if (_wenviron)
    _wenviron = msvcrt_SnapshotOfEnvironmentW(_wenviron);
    
@@ -151,8 +151,8 @@ int CDECL _wputenv(const MSVCRT_wchar_t *str)
  if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0;
 
  /* Update the __p__environ array only when already initialized */
- if (_environ)
-   _environ = msvcrt_SnapshotOfEnvironmentA(_environ);
+ if (MSVCRT__environ)
+   MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ);
  if (_wenviron)
    _wenviron = msvcrt_SnapshotOfEnvironmentW(_wenviron);
 
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index 204fe9ca55e..5d4540f9116 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -119,7 +119,7 @@ void   msvcrt_set_errno(int);
 void   _purecall(void);
 void   _amsg_exit(int errnum);
 
-extern char **_environ;
+extern char **MSVCRT__environ;
 extern MSVCRT_wchar_t **_wenviron;
 
 extern char ** msvcrt_SnapshotOfEnvironmentA(char **);
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 9518fa31f09..fffe8832e96 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -208,7 +208,7 @@
 @ cdecl _ecvt(double long ptr ptr)
 @ cdecl _endthread ()
 @ cdecl _endthreadex(long)
-@ extern _environ
+@ extern _environ MSVCRT__environ
 @ cdecl _eof(long)
 @ cdecl _errno() MSVCRT__errno
 @ cdecl _except_handler2(ptr ptr ptr ptr)
-- 
2.11.4.GIT