summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorGurusamy Sarathy <gsar@cpan.org>2000-01-24 13:04:45 +0000
committerGurusamy Sarathy <gsar@cpan.org>2000-01-24 13:04:45 +0000
commit6f4183fe04888927cb36b966262c959c5166404b (patch)
tree32ab99da98da61a8b85e3421019af7edf6cc1fe4 /win32
parent6570f7848406340d371b9f81689299e3b739279f (diff)
downloadperl-6f4183fe04888927cb36b966262c959c5166404b.tar.gz
enable function wrappers for access to globals under MULTIPLICITY
(provides binary compatibility in the face of changes in interpreter structure) p4raw-id: //depot/perl@4878
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile15
-rw-r--r--win32/makefile.mk15
2 files changed, 24 insertions, 6 deletions
diff --git a/win32/Makefile b/win32/Makefile
index c100d45777..e9e4892d9d 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -68,14 +68,14 @@ INST_ARCH = \$(ARCHNAME)
# XXX WARNING! This option currently undergoing changes. May be broken.
#
# Beginnings of interpreter cloning/threads: still rather rough, fails
-# tests. This should be enabled to get the fork() emulation. Do not
-# enable unless you know what you're doing!
+# tests. This should be enabled to get the fork() emulation. This needs
+# one of USE_MULTI or USE_OBJECT enabled as well.
#
#USE_ITHREADS = define
#
# uncomment to enable the implicit "host" layer for all system calls
-# made by perl. This is needed and auto-enabled by USE_OBJECT above.
+# made by perl. This needs one of USE_MULTI or USE_OBJECT above.
# This is also needed to get fork().
#
#USE_IMP_SYS = define
@@ -242,6 +242,15 @@ USE_IMP_SYS = undef
USE_PERLCRT = undef
!ENDIF
+!IF "$(USE_IMP_SYS)$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" == "defineundefundefundef"
+USE_MULTI = define
+!ENDIF
+
+!IF "$(USE_ITHREADS)$(USE_MULTI)$(USE_OBJECT)" == "defineundefundef"
+USE_MULTI = define
+USE_5005THREADS = undef
+!ENDIF
+
!IF "$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" != "undefundefundef"
BUILDOPT = $(BUILDOPT) -DPERL_IMPLICIT_CONTEXT
!ENDIF
diff --git a/win32/makefile.mk b/win32/makefile.mk
index e6ed1765a7..75f6a5cbe6 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -73,14 +73,14 @@ INST_ARCH *= \$(ARCHNAME)
# XXX WARNING! This option currently undergoing changes. May be broken.
#
# Beginnings of interpreter cloning/threads: still rather rough, fails
-# tests. This should be enabled to get the fork() emulation. Do not
-# enable unless you know what you're doing!
+# tests. This should be enabled to get the fork() emulation. This needs
+# one of USE_MULTI or USE_OBJECT enabled as well.
#
#USE_ITHREADS *= define
#
# uncomment to enable the implicit "host" layer for all system calls
-# made by perl. This is needed and auto-enabled by USE_OBJECT above.
+# made by perl. This needs one of USE_MULTI or USE_OBJECT above.
# This is also needed to get fork().
#
#USE_IMP_SYS *= define
@@ -249,6 +249,15 @@ USE_ITHREADS *= undef
USE_IMP_SYS *= undef
USE_PERLCRT *= undef
+.IF "$(USE_IMP_SYS)$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" == "defineundefundefundef"
+USE_MULTI != define
+.ENDIF
+
+.IF "$(USE_ITHREADS)$(USE_MULTI)$(USE_OBJECT)" == "defineundefundef"
+USE_MULTI != define
+USE_5005THREADS != undef
+.ENDIF
+
.IF "$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" != "undefundefundef"
BUILDOPT += -DPERL_IMPLICIT_CONTEXT
.ENDIF