From: Steve Hay <SteveHay@planit.com>
Date: Fri, 17 Apr 2009 08:37:47 +0000 (+0100)
Subject: Remove last vestiges of USE_WIN32_RTL_ENV
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d0fc6d8d2647c8903746df622ecf1140b22e36a4;p=p5sagit%2Fp5-mst-13.2.git

Remove last vestiges of USE_WIN32_RTL_ENV

That was removed long ago by #8916, but some leftovers remained. See:
http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2009-04/msg00156.html
---

diff --git a/win32/win32.c b/win32/win32.c
index 2e66fc0..9154613 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1767,7 +1767,8 @@ win32_putenv(const char *name)
              *    environment (like in UNIX).
              *  * we don't have to deal with RTL globals, bugs and leaks.
              *  * Much faster.
-             * Why you may want to enable USE_WIN32_RTL_ENV:
+             * Why you may want to use the RTL environment handling
+             * (previously enabled by USE_WIN32_RTL_ENV):
              *  * environ[] and RTL functions will not reflect changes,
              *    which might be an issue if extensions want to access
              *    the env. via RTL.  This cuts both ways, since RTL will
diff --git a/win32/win32iop-o.h b/win32/win32iop-o.h
index 47c0de9..57b073b 100644
--- a/win32/win32iop-o.h
+++ b/win32/win32iop-o.h
@@ -127,10 +127,8 @@ DllExport  void		win32_seekdir(DIR *dirp, long loc);
 DllExport  void		win32_rewinddir(DIR *dirp);
 DllExport  int		win32_closedir(DIR *dirp);
 
-#ifndef USE_WIN32_RTL_ENV
 DllExport  char*	win32_getenv(const char *name);
 DllExport  int		win32_putenv(const char *name);
-#endif
 
 DllExport  unsigned 	win32_sleep(unsigned int);
 DllExport  int		win32_times(struct tms *timebuf);
@@ -332,12 +330,10 @@ END_EXTERN_C
 #undef crypt
 #define crypt(t,s)		win32_crypt(t,s)
 
-#ifndef USE_WIN32_RTL_ENV
 #undef getenv
 #define getenv win32_getenv
 #undef putenv
 #define putenv win32_putenv
-#endif
 
 #endif /* WIN32IO_IS_STDIO */
 #endif /* WIN32IOP_H */
diff --git a/win32/wince.c b/win32/wince.c
index 8512b4d..b9163d7 100644
--- a/win32/wince.c
+++ b/win32/wince.c
@@ -893,8 +893,6 @@ win32_longpath(char *path)
   return path;
 }
 
-#ifndef USE_WIN32_RTL_ENV
-
 DllExport char *
 win32_getenv(const char *name)
 {
@@ -907,8 +905,6 @@ win32_putenv(const char *name)
   return xceputenv(name);
 }
 
-#endif
-
 static long
 filetime_to_clock(PFILETIME ft)
 {