From: Gurusamy Sarathy <gsar@cpan.org>
Date: Wed, 26 Jan 2000 09:28:37 +0000 (+0000)
Subject: tweak exports list on Windows
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=dfdd1393a5b8826d427524003a858b7556c66371;p=p5sagit%2Fp5-mst-13.2.git

tweak exports list on Windows

p4raw-id: //depot/perl@4902
---

diff --git a/makedef.pl b/makedef.pl
index eb92719..9c2e96a 100644
--- a/makedef.pl
+++ b/makedef.pl
@@ -95,24 +95,20 @@ while (<CFG>) {
     $define{$1} = 1 if /^\s*#\s*define\s+(USE_ITHREADS)\b/;
     $define{$1} = 1 if /^\s*#\s*define\s+(USE_PERLIO)\b/;
     $define{$1} = 1 if /^\s*#\s*define\s+(MULTIPLICITY)\b/;
+    $define{$1} = 1 if /^\s*#\s*define\s+(PERL_IMPLICIT_SYS)\b/;
     $define{$1} = 1 if /^\s*#\s*define\s+(PERL_BINCOMPAT_5005)\b/;
 }
 close(CFG);
 
 if ($PLATFORM eq 'win32') {
     warn join(' ',keys %define)."\n";
-    if ($define{PERL_OBJECT} || $define{MULTIPLICITY}) {
-	print "LIBRARY Perl56\n";
-	print "DESCRIPTION 'Perl interpreter'\n";
-	print "EXPORTS\n";
+    print "LIBRARY Perl56\n";
+    print "DESCRIPTION 'Perl interpreter'\n";
+    print "EXPORTS\n";
+    if ($define{PERL_IMPLICIT_SYS}) {
 	output_symbol("perl_get_host_info");
 	output_symbol("perl_alloc_override");
     }
-    else {
-	print "LIBRARY Perl56\n";
-	print "DESCRIPTION 'Perl interpreter, export autogenerated'\n";
-	print "EXPORTS\n";
-    } 
 }
 elsif ($PLATFORM eq 'os2') {
     ($v = $]) =~ s/(\d\.\d\d\d)(\d\d)$/$1_$2/;
diff --git a/t/op/fork.t b/t/op/fork.t
index b743a45..11efa79 100755
--- a/t/op/fork.t
+++ b/t/op/fork.t
@@ -6,7 +6,10 @@ BEGIN {
     chdir 't' if -d 't';
     unshift @INC, '../lib';
     require Config; import Config;
-    unless ($Config{'d_fork'} || ($^O eq 'MSWin32' && $Config{'useithreads'})) {
+    unless ($Config{'d_fork'}
+	    or ($^O eq 'MSWin32' and $Config{useithreads}
+		and $Config{ccflags} =~ /-DPERL_IMPLICIT_SYS/))
+    {
 	print "1..0 # Skip: no fork\n";
 	exit 0;
     }
diff --git a/win32/win32.h b/win32/win32.h
index 066ed72..69a4caf 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -232,7 +232,7 @@ typedef long		gid_t;
 /* compatibility stuff for other compilers goes here */
 
 
-#if !defined(PERL_OBJECT) && defined(PERL_MEMBER_PTR_SIZE)
+#if !defined(PERL_OBJECT) && defined(PERL_CAPI) && defined(PERL_MEMBER_PTR_SIZE)
 #  define STRUCT_MGVTBL_DEFINITION \
 struct mgvtbl {								\
     union {								\
@@ -268,7 +268,7 @@ struct mgvtbl {								\
     U8		op_flags;						\
     U8		op_private;
 
-#endif /* !PERL_OBJECT && PERL_MEMBER_PTR_SIZE */
+#endif /* !PERL_OBJECT && PERL_CAPI && PERL_MEMBER_PTR_SIZE */
 
 
 START_EXTERN_C