[PATCH v2] msvcrt: Don't include MSVC 8.0+ environment functions in SOs for older DLLs

[Alex Henrie]

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com>
---
v2: Added missing comment to #endif

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

diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c
index 5a0241885a..06e16a865e 100644
--- a/dlls/msvcrt/data.c
+++ b/dlls/msvcrt/data.c
@@ -626,6 +626,8 @@ void CDECL MSVCRT___set_app_type(int app_type)
   MSVCRT_app_type = app_type;
 }
 
+#if _MSVCR_VER>=140
+
 /*********************************************************************
  *		_get_initial_narrow_environment (UCRTBASE.@)
  */
@@ -732,6 +734,8 @@ MSVCRT_wchar_t* CDECL _get_wide_winmain_command_line(void)
   return wide_command_line = s;
 }
 
+#endif /* _MSVCR_VER>=140 */
+
 /*********************************************************************
  *    _get_winmajor (MSVCRT.@)
  */
diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c
index 1370fbbb70..f48eabf7e8 100644
--- a/dlls/msvcrt/environ.c
+++ b/dlls/msvcrt/environ.c
@@ -207,8 +207,10 @@ int CDECL _wputenv_s(const MSVCRT_wchar_t *name, const MSVCRT_wchar_t *value)
     return ret;
 }
 
+#if _MSVCR_VER>=80
+
 /******************************************************************
- *		_dupenv_s (MSVCRT.@)
+ *		_dupenv_s (MSVCR80.@)
  */
 int CDECL _dupenv_s(char **buffer, MSVCRT_size_t *numberOfElements, const char *varname)
 {
@@ -232,7 +234,7 @@ int CDECL _dupenv_s(char **buffer, MSVCRT_size_t *numberOfElements, const char *
 }
 
 /******************************************************************
- *		_wdupenv_s (MSVCRT.@)
+ *		_wdupenv_s (MSVCR80.@)
  */
 int CDECL _wdupenv_s(MSVCRT_wchar_t **buffer, MSVCRT_size_t *numberOfElements,
                      const MSVCRT_wchar_t *varname)
@@ -256,6 +258,8 @@ int CDECL _wdupenv_s(MSVCRT_wchar_t **buffer, MSVCRT_size_t *numberOfElements,
     return 0;
 }
 
+#endif /* _MSVCR_VER>=80 */
+
 /******************************************************************
  *		getenv_s (MSVCRT.@)
  */
-- 
2.15.1

[Piotr Caban]

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>