From: Gurusamy Sarathy <gsar@cpan.org>
Date: Mon, 21 Sep 1998 20:34:10 +0000 (+0000)
Subject: make xsubpp generate well-formed code with CAPI && !PERL_OBJECT
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7ee8c957e643df1e9e47d243c3269eb47c2da591;p=p5sagit%2Fp5-mst-13.2.git

make xsubpp generate well-formed code with CAPI && !PERL_OBJECT

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

diff --git a/lib/ExtUtils/xsubpp b/lib/ExtUtils/xsubpp
index 523dabc..5c45a85 100755
--- a/lib/ExtUtils/xsubpp
+++ b/lib/ExtUtils/xsubpp
@@ -1254,30 +1254,37 @@ EOF
 }
 
 # print initialization routine
-if ($WantCAPI) {
+
 print Q<<"EOF";
-#
 ##ifdef __cplusplus
 #extern "C"
 ##endif
+EOF
+
+if ($WantCAPI) {
+print Q<<"EOF";
+##ifdef PERL_CAPI
 #XS(boot__CAPI_entry)
-#[[
-#    dXSARGS;
-#    char* file = __FILE__;
-#
+##else
 EOF
-} else {
+}
+
 print Q<<"EOF";
-##ifdef __cplusplus
-#extern "C"
-##endif
 #XS(boot_$Module_cname)
+EOF
+
+if ($WantCAPI) {
+print Q<<"EOF";
+##endif	/* PERL_CAPI */
+EOF
+}
+
+print Q<<"EOF";
 #[[
 #    dXSARGS;
 #    char* file = __FILE__;
 #
 EOF
-}
 
 print Q<<"EOF" if $WantVersionChk ;
 #    XS_VERSION_BOOTCHECK ;
@@ -1312,7 +1319,7 @@ EOF
 
 if ($WantCAPI) { 
 print Q<<"EOF";
-#
+##ifdef PERL_CAPI
 ##define XSCAPI(name) void name(CV* cv, void* pPerl)
 #
 ##ifdef __cplusplus
@@ -1323,7 +1330,7 @@ print Q<<"EOF";
 #    SetCPerlObj(pPerl);
 #    boot__CAPI_entry(cv);
 #]]
-#
+##endif	/* PERL_CAPI */
 EOF
 }