diff options
author | Gurusamy Sarathy <gsar@cpan.org> | 1998-04-24 17:01:05 +0000 |
---|---|---|
committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-04-24 17:01:05 +0000 |
commit | b207eff1ea454206afe170b4d927f265fef3e83a (patch) | |
tree | 001ba3d52ff6e677ce33499de2fcae05187dae32 /lib | |
parent | e3b8966e2a0e0357b86674327ee528dbb5f122a6 (diff) | |
download | perl-b207eff1ea454206afe170b4d927f265fef3e83a.tar.gz |
[asperl] add AS patch#18
p4raw-id: //depot/asperl@898
Diffstat (limited to 'lib')
-rw-r--r-- | lib/ExtUtils/MM_Unix.pm | 2 | ||||
-rwxr-xr-x | lib/ExtUtils/xsubpp | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm index 9ae5abe0bd..2daa056067 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm @@ -3246,7 +3246,7 @@ sub tool_xsubpp { } } - $xsubpp = $self->{CAPI} ? "xsubpp -perlobject" : "xsubpp"; + $xsubpp = $self->{CAPI} ? "xsubpp -object_capi" : "xsubpp"; return qq{ XSUBPPDIR = $xsdir diff --git a/lib/ExtUtils/xsubpp b/lib/ExtUtils/xsubpp index fafa9cc2d5..8e253ff215 100755 --- a/lib/ExtUtils/xsubpp +++ b/lib/ExtUtils/xsubpp @@ -6,7 +6,7 @@ xsubpp - compiler to convert Perl XS code into C code =head1 SYNOPSIS -B<xsubpp> [B<-v>] [B<-C++>] [B<-except>] [B<-s pattern>] [B<-prototypes>] [B<-noversioncheck>] [B<-nolinenumbers>] [B<-typemap typemap>] [B<-perlobject>]... file.xs +B<xsubpp> [B<-v>] [B<-C++>] [B<-except>] [B<-s pattern>] [B<-prototypes>] [B<-noversioncheck>] [B<-nolinenumbers>] [B<-typemap typemap>] [B<-object_capi>]... file.xs =head1 DESCRIPTION @@ -59,7 +59,7 @@ number. Prevents the inclusion of `#line' directives in the output. -=item B<-perlobject> +=item B<-object_capi> Compile code as C in a PERL_OBJECT environment. @@ -126,7 +126,7 @@ SWITCH: while (@ARGV and $ARGV[0] =~ /^-./) { $WantPrototypes = 1, next SWITCH if $flag eq 'prototypes'; $WantVersionChk = 0, next SWITCH if $flag eq 'noversioncheck'; $WantVersionChk = 1, next SWITCH if $flag eq 'versioncheck'; - $WantCAPI = 1, next SWITCH if $flag eq 'perlobject'; + $WantCAPI = 1, next SWITCH if $flag eq 'object_capi'; $except = " TRY", next SWITCH if $flag eq 'except'; push(@tm,shift), next SWITCH if $flag eq 'typemap'; $WantLineNumbers = 0, next SWITCH if $flag eq 'nolinenumbers'; @@ -1240,7 +1240,8 @@ EOF if ($WantCAPI) { print Q<<"EOF"; # -##define XSCAPI(name) void name(void* pPerl, CV* cv) +##define XSCAPI(name) void name(CV* cv, void* pPerl) +# ##ifdef __cplusplus #extern "C" ##endif |