diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1998-07-27 18:10:14 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-07-27 18:10:14 +0000 |
| commit | 6a27c1886bf0bf3e39d48bdfab21e85f07acacb3 (patch) | |
| tree | 9850608e2eb22634c1420b7cd8055bb91eb13b52 /win32 | |
| parent | c485e6072d15e92c314a8b9cb6957c3edf13f985 (diff) | |
| download | perl-6a27c1886bf0bf3e39d48bdfab21e85f07acacb3.tar.gz | |
integrate 5.005_01 changes from maint
p4raw-id: //depot/perl@1670
p4raw-integrated: from //depot/maint-5.005/perl@1667 'copy in'
README.win32 win32/GenCAPI.pl win32/win32.c (@1649..)
pod/perldelta.pod (@1654..) 'merge in' toke.c (@1649..) proto.h
(@1662..)
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/GenCAPI.pl | 46 | ||||
| -rw-r--r-- | win32/win32.c | 1 |
2 files changed, 47 insertions, 0 deletions
diff --git a/win32/GenCAPI.pl b/win32/GenCAPI.pl index 09827f29d7..33ffe9446d 100644 --- a/win32/GenCAPI.pl +++ b/win32/GenCAPI.pl @@ -202,6 +202,29 @@ extern "C" $type $funcName ($args) ENDCODE print OUTFILE "#endif\n" unless ($separateObj == 0); } + elsif($name eq "sv_catpvf_mg") { + print OUTFILE "\n#ifdef $name" . "_defined" unless ($separateObj == 0); + $args[0] =~ /(\w+)\W*$/; + $arg0 = $1; + $args[1] =~ /(\w+)\W*$/; + $arg1 = $1; + print OUTFILE <<ENDCODE; + +#undef $name +#ifndef mg_set +#define mg_set pPerl->Perl_mg_set +#endif +extern "C" $type $funcName ($args) +{ + va_list args; + va_start(args, $arg1); + pPerl->Perl_sv_vcatpvfn($arg0, $arg1, strlen($arg1), &args, NULL, 0, NULL); + va_end(args); + SvSETMAGIC(sv); +} +ENDCODE + print OUTFILE "#endif\n" unless ($separateObj == 0); + } elsif($name eq "sv_setpvf") { print OUTFILE "\n#ifdef $name" . "_defined" unless ($separateObj == 0); $args[0] =~ /(\w+)\W*$/; @@ -221,6 +244,29 @@ extern "C" $type $funcName ($args) ENDCODE print OUTFILE "#endif\n" unless ($separateObj == 0); } + elsif($name eq "sv_setpvf_mg") { + print OUTFILE "\n#ifdef $name" . "_defined" unless ($separateObj == 0); + $args[0] =~ /(\w+)\W*$/; + $arg0 = $1; + $args[1] =~ /(\w+)\W*$/; + $arg1 = $1; + print OUTFILE <<ENDCODE; + +#undef $name +#ifndef mg_set +#define mg_set pPerl->Perl_mg_set +#endif +extern "C" $type $funcName ($args) +{ + va_list args; + va_start(args, $arg1); + pPerl->Perl_sv_vsetpvfn($arg0, $arg1, strlen($arg1), &args, NULL, 0, NULL); + va_end(args); + SvSETMAGIC(sv); +} +ENDCODE + print OUTFILE "#endif\n" unless ($separateObj == 0); + } elsif($name eq "fprintf") { print OUTFILE "\n#ifdef $name" . "_defined" unless ($separateObj == 0); $args[0] =~ /(\w+)\W*$/; diff --git a/win32/win32.c b/win32/win32.c index 03a9bd8aa9..721b62ace9 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1175,6 +1175,7 @@ win32_crypt(const char *txt, const char *salt) return des_fcrypt(crypt_buffer, txt, salt); #else die("The crypt() function is unimplemented due to excessive paranoia."); + return Nullch; #endif } #endif |