Configure GCC/Win32 build -Duseperlio

Fix a couple of gross issues
  - double-include of ../deb.o in re.dll
  - win32sck.c needs PerlIO and FILE

p4raw-id: //depot/perlio@7752

4 files changed, 3 insertions, 11 deletions

diff --git a/ext/re/hints/MSWin32.pl b/ext/re/hints/MSWin32.pl
index 3ac0fdac4c..858e5f9032 100644
--- a/ext/re/hints/MSWin32.pl
+++ b/ext/re/hints/MSWin32.pl
@@ -7,12 +7,3 @@ if ($^O =~ /MSWin32/) {
     $self->{OBJECT} .= ' ../../deb$(OBJ_EXT)';

 }

 

-# Add explicit link to deb.o to pick up _Perl_deb symbol which is not

-# mentioned in perl56.lib in non DEBUGGING builds

-# Taken lock, stock, and barrel from hints/aix.pl

-#  -- BKS, 11-11-2000

-

-if ($^O =~ /MSWin32/) {

-    $self->{OBJECT} .= ' ../../deb$(OBJ_EXT)';

-}

-

diff --git a/win32/config.gc b/win32/config.gc
index a6b0bcf052..4bf0d95807 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -766,7 +766,7 @@ usemultiplicity='undef'
 usemymalloc='n'
 usenm='false'
 useopcode='true'
-useperlio='undef'
+useperlio='define'
 useposix='true'
 usesfio='false'
 useshrplib='yes'
diff --git a/win32/config_H.gc b/win32/config_H.gc
index f943aad908..0e4cb71d90 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -2994,7 +2994,7 @@
  *	used in a fully backward compatible manner.
  */
 #ifndef USE_PERLIO
-/*#define	USE_PERLIO		/**/
+#define	USE_PERLIO		/**/
 #endif
 
 /* USE_SOCKS:
diff --git a/win32/win32sck.c b/win32/win32sck.c
index 041963a8c9..b83e0d98f1 100644
--- a/win32/win32sck.c
+++ b/win32/win32sck.c
@@ -11,6 +11,7 @@
 #define WIN32IO_IS_STDIO
 #define WIN32SCK_IS_STDSCK
 #define WIN32_LEAN_AND_MEAN
+#define PERLIO_NOT_STDIO 0
 #ifdef __GNUC__
 #define Win32_Winsock
 #endif