summaryrefslogtreecommitdiff
path: root/dist
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2011-09-10 13:11:21 +0200
committerNicholas Clark <nick@ccl4.org>2011-09-11 17:14:15 +0200
commit98e6112272363eb60a3ddeee13b03381e5729032 (patch)
tree52d4e9db70ecb26bfdaa76596fa7488bbf38001f /dist
parent3324ed9f6472f4fa8368f84762b440be0b7392b0 (diff)
downloadperl-98e6112272363eb60a3ddeee13b03381e5729032.tar.gz
Simplify generated XS code by emitting a compatibility version of dVAR.
If ExtUtils::ParseXS emits conditional C pre-processor code once per XS file to provide a default for dVAR, then it doesn't need to emit 4 lines per function to cater for dVAR not being present.
Diffstat (limited to 'dist')
-rw-r--r--dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm10
-rw-r--r--dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm2
-rw-r--r--dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm2
-rw-r--r--dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm6
4 files changed, 8 insertions, 12 deletions
diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm
index 36b88a5b39..04405291bf 100644
--- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm
+++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm
@@ -11,7 +11,7 @@ use Symbol;
our $VERSION;
BEGIN {
- $VERSION = '3.04_03';
+ $VERSION = '3.04_04';
}
use ExtUtils::ParseXS::Constants $VERSION;
use ExtUtils::ParseXS::CountLines $VERSION;
@@ -505,11 +505,7 @@ EOM
#XS_EUPXS(XS_${Full_func_name}); /* prototype to pass -Wmissing-prototypes */
#XS_EUPXS(XS_${Full_func_name})
#[[
-##ifdef dVAR
# dVAR; dXSARGS;
-##else
-# dXSARGS;
-##endif
EOF
print Q(<<"EOF") if $ALIAS;
# dXSI32;
@@ -911,11 +907,7 @@ EOF
print Q(<<"EOF");
#[[
-##ifdef dVAR
# dVAR; dXSARGS;
-##else
-# dXSARGS;
-##endif
EOF
#Under 5.8.x and lower, newXS is declared in proto.h as expecting a non-const
diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm
index 4e97418211..4de9d3cad8 100644
--- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm
+++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm
@@ -3,7 +3,7 @@ use strict;
use warnings;
use Symbol;
-our $VERSION = '3.04_03';
+our $VERSION = '3.04_04';
=head1 NAME
diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm
index 3b166b1739..ff8fd2e8f8 100644
--- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm
+++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm
@@ -1,7 +1,7 @@
package ExtUtils::ParseXS::CountLines;
use strict;
-our $VERSION = '3.04_03';
+our $VERSION = '3.04_04';
our $SECTION_END_MARKER;
diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm
index 408045867c..f3b9d094ab 100644
--- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm
+++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm
@@ -6,7 +6,7 @@ use File::Spec;
use lib qw( lib );
use ExtUtils::ParseXS::Constants ();
-our $VERSION = '3.04_03';
+our $VERSION = '3.04_04';
our (@ISA, @EXPORT_OK);
@ISA = qw(Exporter);
@@ -455,6 +455,10 @@ sub standard_XS_defs {
# define PERL_UNUSED_VAR(var) if (0) var = var
#endif
+#ifndef dVAR
+# define dVAR dNOOP
+#endif
+
/* This stuff is not part of the API! You have been warned. */
#ifndef PERL_VERSION_DECIMAL