Integrate mainline (_071-ish)

p4raw-id: //depot/ansiperl@1400

diff --cc win32/config_H.gc
index b74a667,d47fc66..2ada949
--- 1/win32/config_H.gc
--- 2/win32/config_H.gc
+++ b/win32/config_H.gc
@@@ -34,8 -34,8 +34,8 @@@
   *    This symbol is the filename expanded version of the BIN symbol, for
   *    programs that do not want to deal with that at run-time.
   */
- #define BIN "c:\\perl.gcc\\5.00469\\bin\\MSWin32-x86" /**/
- #define BIN_EXP "c:\\perl.gcc\\5.00469\\bin\\MSWin32-x86"     /**/
 -#define BIN "c:\\perl\\5.00471\\bin\\MSWin32-x86"     /**/
 -#define BIN_EXP "c:\\perl\\5.00471\\bin\\MSWin32-x86" /**/
++#define BIN "c:\\perl.gcc\\5.00471\\bin\\MSWin32-x86" /**/
++#define BIN_EXP "c:\\perl.gcc\\5.00471\\bin\\MSWin32-x86"     /**/
  
  /* CPPSTDIN:
   *    This symbol contains the first part of the string which will invoke

diff --cc win32/makefile.mk
Simple merge