RE: some win32 fixes

Message-ID: <402099F49BEED211999700805FC7359F9CAF49@ru0028exch01.spb.lucent.com>

p4raw-id: //depot/perl@8706

diff --git a/toke.c b/toke.c
index a1f521d..3c9c5f3 100644 (file)
--- a/toke.c
+++ b/toke.c
@@ -4170,10 +4170,6 @@ Perl_yylex(pTHX)
                        (void)PerlIO_seek(PL_rsfp, 0L, 0);
                    }
                    if (PerlLIO_setmode(PerlIO_fileno(PL_rsfp), O_TEXT) != -1) {
-#if defined(__BORLANDC__)
-                       /* XXX see note in do_binmode() */
-                       ((FILE*)PL_rsfp)->flags |= _F_BIN;
-#endif
                        if (loc > 0)
                            PerlIO_seek(PL_rsfp, loc, 0);
                    }

diff --git a/win32/Makefile b/win32/Makefile
index 20512cd..abd3b14 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -66,9 +66,7 @@ USE_IMP_SYS = define
 
 #
 # uncomment to enable the experimental PerlIO I/O subsystem.
-# This is currently incompatible with USE_MULTI, USE_ITHREADS,
-# and USE_IMP_SYS
-#USE_PERLIO    = define
+USE_PERLIO     = define
 
 #
 # WARNING! This option is deprecated and will eventually go away (enable
@@ -247,6 +245,10 @@ USE_ITHREADS       = undef
 USE_IMP_SYS    = undef
 !ENDIF
 
+!IF "$(USE_PERLIO)" == ""
+USE_PERLIO     = undef
+!ENDIF
+
 !IF "$(USE_PERLCRT)" == ""
 USE_PERLCRT    = undef
 !ENDIF
@@ -729,6 +731,7 @@ CFG_VARS    =                                       \
                "useithreads=$(USE_ITHREADS)"           \
                "usethreads=$(USE_5005THREADS)"         \
                "usemultiplicity=$(USE_MULTI)"          \
+               "useperlio=$(USE_PERLIO)"               \
                "LINK_FLAGS=$(LINK_FLAGS:"=\")"         \
                "optimize=$(OPTIMIZE:"=\")"
 

diff --git a/win32/config.bc b/win32/config.bc
index ec4a09e..bc7b1da 100644 (file)
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -770,7 +770,7 @@ usemultiplicity='undef'
 usemymalloc='n'
 usenm='false'
 useopcode='true'
-useperlio='undef'
+useperlio='~USE_PERLIO~'
 useposix='true'
 usesfio='false'
 useshrplib='yes'

diff --git a/win32/config.gc b/win32/config.gc
index c62ea71..196b22c 100644 (file)
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -770,7 +770,7 @@ usemultiplicity='undef'
 usemymalloc='n'
 usenm='false'
 useopcode='true'
-useperlio='define'
+useperlio='~USE_PERLIO~'
 useposix='true'
 usesfio='false'
 useshrplib='yes'

diff --git a/win32/config.vc b/win32/config.vc
index e770921..9cb3a77 100644 (file)
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -770,7 +770,7 @@ usemultiplicity='undef'
 usemymalloc='n'
 usenm='false'
 useopcode='true'
-useperlio='define'
+useperlio='~USE_PERLIO~'
 useposix='true'
 usesfio='false'
 useshrplib='yes'

diff --git a/win32/config_H.bc b/win32/config_H.bc
index b932d3c..04768a9 100644 (file)
--- a/win32/config_H.bc
+++ b/win32/config_H.bc
@@ -3123,7 +3123,7 @@
  *     used in a fully backward compatible manner.
  */
 #ifndef USE_PERLIO
-/*#define      USE_PERLIO              /**/
+#define        USE_PERLIO              /**/
 #endif
 
 /* USE_SOCKS:

diff --git a/win32/makefile.mk b/win32/makefile.mk
index ce11be4..9b1e3e7 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -67,6 +67,10 @@ USE_ITHREADS *= define
 USE_IMP_SYS    *= define
 
 #
+# uncomment to enable the experimental PerlIO I/O subsystem.
+USE_PERLIO     = define
+
+#
 # WARNING! This option is deprecated and will eventually go away (enable
 # USE_ITHREADS instead).
 #
@@ -248,6 +252,7 @@ USE_MULTI   *= undef
 USE_OBJECT     *= undef
 USE_ITHREADS   *= undef
 USE_IMP_SYS    *= undef
+USE_PERLIO     *= undef
 USE_PERLCRT    *= undef
 
 .IF "$(USE_IMP_SYS)$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" == "defineundefundefundef"
@@ -278,6 +283,11 @@ ARCHNAME   = MSWin32-$(PROCESSOR_ARCHITECTURE)-thread
 .ELIF "$(USE_MULTI)" == "define"
 ARCHNAME       = MSWin32-$(PROCESSOR_ARCHITECTURE)-multi
 .ELSE
+.IF "$(USE_PERLIO)" == "define"
+ARCHNAME       = MSWin32-$(PROCESSOR_ARCHITECTURE)-perlio
+.ELSE
+ARCHNAME       = MSWin32-$(PROCESSOR_ARCHITECTURE)
+.ENDIF
 ARCHNAME       = MSWin32-$(PROCESSOR_ARCHITECTURE)
 .ENDIF
 
@@ -862,6 +872,7 @@ CFG_VARS    =                                       \
                useithreads=$(USE_ITHREADS)     ~       \
                usethreads=$(USE_5005THREADS)   ~       \
                usemultiplicity=$(USE_MULTI)    ~       \
+               useperlio=$(USE_PERLIO)         ~       \
                LINK_FLAGS=$(LINK_FLAGS:s/\/\\/)                ~       \
                optimize=$(OPTIMIZE)