Change 11989 by jhi@alpha on 2001/09/10 23:31:45
Subject: [PATCH] Building on win32 w/o perlio
From: "Mattia Barbon" <[EMAIL PROTECTED]>
Date: Mon, 10 Sep 2001 23:38:46 +0200
Message-ID: <3B9D4F06.14433.2C37644@localhost>
Affected files ...
... //depot/perl/perl.c#369 edit
... //depot/perl/win32/Makefile#193 edit
... //depot/perl/win32/makefile.mk#210 edit
Differences ...
==== //depot/perl/perl.c#369 (text) ====
Index: perl/perl.c
--- perl/perl.c.~1~ Mon Sep 10 17:45:05 2001
+++ perl/perl.c Mon Sep 10 17:45:05 2001
@@ -864,7 +864,9 @@
# endif
# ifndef NETWARE
if (PerlProc_lasthost()) {
+# ifdef USE_PERLIO
PerlIO_cleanup();
+# endif
}
# endif
PerlMem_free(aTHXx);
@@ -874,7 +876,9 @@
win32_delete_internal_host(host);
# endif
# else
+# ifdef USE_PERLIO
PerlIO_cleanup();
+# endif
PerlMem_free(aTHXx);
# endif
#else
==== //depot/perl/win32/Makefile#193 (text) ====
Index: perl/win32/Makefile
--- perl/win32/Makefile.~1~ Mon Sep 10 17:45:05 2001
+++ perl/win32/Makefile Mon Sep 10 17:45:05 2001
@@ -508,10 +508,13 @@
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 @@
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)
==== //depot/perl/win32/makefile.mk#210 (text) ====
Index: perl/win32/makefile.mk
--- perl/win32/makefile.mk.~1~ Mon Sep 10 17:45:05 2001
+++ perl/win32/makefile.mk Mon Sep 10 17:45:05 2001
@@ -664,10 +664,13 @@
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 @@
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))
End of Patch.
