Building on win32 w/o perlio

Message-ID: <3B9D4F06.14433.2C37644@localhost>

p4raw-id: //depot/perl@11989

diff --git a/perl.c b/perl.c
index 510a5ed..75dec1b 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -864,7 +864,9 @@ perl_free(pTHXx)
 #    endif
 #    ifndef NETWARE
     if (PerlProc_lasthost()) {
+#      ifdef USE_PERLIO
        PerlIO_cleanup();
+#      endif
     }
 #    endif
     PerlMem_free(aTHXx);
@@ -874,7 +876,9 @@ perl_free(pTHXx)
     win32_delete_internal_host(host);
 #    endif
 #  else
+#    ifdef USE_PERLIO
     PerlIO_cleanup();
+#    endif
     PerlMem_free(aTHXx);
 #  endif
 #else

diff --git a/win32/Makefile b/win32/Makefile
index 0287a18..93f8cb2 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -508,10 +508,13 @@ EXTRACORE_SRC     = $(EXTRACORE_SRC) ..\perlio.c
 
 WIN32_SRC      =               \
                .\win32.c       \
-               .\win32io.c     \
                .\win32sck.c    \
                .\win32thread.c
 
+!IF "$(USE_PERLIO)" == "define"
+WIN32_SRC      = $(WIN32_SRC) .\win32io.c
+!ENDIF
+
 !IF "$(CRYPT_SRC)" != ""
 WIN32_SRC      = $(WIN32_SRC) .\$(CRYPT_SRC)
 !ENDIF
@@ -574,7 +577,7 @@ WIN32_OBJ   = $(WIN32_SRC:.c=.obj)
 MINICORE_OBJ   = $(MICROCORE_OBJ:..\=.\mini\)  \
                  $(MINIDIR)\miniperlmain$(o)   \
                  $(MINIDIR)\perlio$(o)
-MINIWIN32_OBJ  = $(WIN32_OBJ:.\=.\mini\)
+MINIWIN32_OBJ  = $(WIN32_OBJ:.\=.\mini\) $(MINIDIR)\win32io$(o)
 MINI_OBJ       = $(MINICORE_OBJ) $(MINIWIN32_OBJ)
 DLL_OBJ                = $(DLL_SRC:.c=.obj)
 X2P_OBJ                = $(X2P_SRC:.c=.obj)

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 0b4b685..63db476 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -664,10 +664,13 @@ EXTRACORE_SRC     += ..\perlio.c
 
 WIN32_SRC      =               \
                .\win32.c       \
-               .\win32io.c     \
                .\win32sck.c    \
                .\win32thread.c
 
+.IF "$(USE_PERLIO)" == "define"
+WIN32_SRC      += .\win32io.c
+.ENDIF
+
 .IF "$(CRYPT_SRC)" != ""
 WIN32_SRC      += .\$(CRYPT_SRC)
 .ENDIF
@@ -728,7 +731,7 @@ MICROCORE_OBJ       = $(MICROCORE_SRC:db:+$(o))
 CORE_OBJ       = $(MICROCORE_OBJ) $(EXTRACORE_SRC:db:+$(o))
 WIN32_OBJ      = $(WIN32_SRC:db:+$(o))
 MINICORE_OBJ   = $(MINIDIR)\{$(MICROCORE_OBJ:f) miniperlmain$(o) perlio$(o)}
-MINIWIN32_OBJ  = $(MINIDIR)\{$(WIN32_OBJ:f)}
+MINIWIN32_OBJ  = $(MINIDIR)\{$(WIN32_OBJ:f)} $(MINIDIR)\win32io$(o)
 MINI_OBJ       = $(MINICORE_OBJ) $(MINIWIN32_OBJ)
 DLL_OBJ                = $(DLL_SRC:db:+$(o))
 X2P_OBJ                = $(X2P_SRC:db:+$(o))