diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1998-08-10 07:02:38 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-08-10 07:02:38 +0000 |
| commit | dfe13c55d349c8cc782995becdedd62551082672 (patch) | |
| tree | c0554f0cd4de1bffa629f662539d3b0654f8b3f4 /win32 | |
| parent | 2aea9f8a7ec940891eef705f344a93a3b76154a2 (diff) | |
| download | perl-dfe13c55d349c8cc782995becdedd62551082672.tar.gz | |
various tweaks: fix signed vs. unsigned problems that prevented C++
builds; add sundry PERL_OBJECT scaffolding to get it to build; fix
lexical warning testsuite for win32
p4raw-id: //depot/perl@1777
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/GenCAPI.pl | 12 | ||||
| -rw-r--r-- | win32/Makefile | 1 | ||||
| -rw-r--r-- | win32/makefile.mk | 3 |
3 files changed, 11 insertions, 5 deletions
diff --git a/win32/GenCAPI.pl b/win32/GenCAPI.pl index 33ffe9446d..4c3947fec5 100644 --- a/win32/GenCAPI.pl +++ b/win32/GenCAPI.pl @@ -141,10 +141,14 @@ while () { @args = split(',', $args); if ($args[$#args] =~ /\s*\.\.\.\s*/) { if(($name eq "croak") or ($name eq "deb") or ($name eq "die") - or ($name eq "form") or ($name eq "warn")) { + or ($name eq "form") or ($name eq "warn") + or ($name eq "warner")) { print OUTFILE "\n#ifdef $name" . "_defined" unless ($separateObj == 0); - $args[0] =~ /(\w+)\W*$/; - $arg = $1; + for (@args) { $_ = $1 if /(\w+)\W*$/; } + $arg = $args[$#args-1]; + my $start = ''; + $start = join(', ',@args[0 .. ($#args - 2)]) if @args > 2; + $start .= ', ' if $start; print OUTFILE <<ENDCODE; #undef $name @@ -157,7 +161,7 @@ extern "C" $type $funcName ($args) pmsg = pPerl->Perl_mess($arg, &args); New(0, pstr, strlen(pmsg)+1, char); strcpy(pstr, pmsg); -$return pPerl->Perl_$name(pstr); +$return pPerl->Perl_$name($start pstr); va_end(args); } ENDCODE diff --git a/win32/Makefile b/win32/Makefile index 07e62c4d40..e00611d5f8 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -431,6 +431,7 @@ CORE_NOCFG_H = \ ..\unixish.h \ ..\utf8.h \ ..\util.h \ + ..\warning.h \ ..\XSUB.h \ ..\EXTERN.h \ ..\perlvars.h \ diff --git a/win32/makefile.mk b/win32/makefile.mk index 62373d0515..a786a61c05 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -199,7 +199,7 @@ OPTIMIZE = -O2 $(RUNTIME) LINK_DBG = .ENDIF -CFLAGS = -K -w -d -tWM -tWD $(INCLUDES) $(DEFINES) $(LOCDEFS) \ +CFLAGS = -w -g0 -d -tWM -tWD $(INCLUDES) $(DEFINES) $(LOCDEFS) \ $(PCHFLAGS) $(OPTIMIZE) LINK_FLAGS = $(LINK_DBG) -L$(CCLIBDIR) $(EXTRALIBDIRS:^"-L") OBJOUT_FLAG = -o @@ -548,6 +548,7 @@ CORE_NOCFG_H = \ ..\unixish.h \ ..\utf8.h \ ..\util.h \ + ..\warning.h \ ..\XSUB.h \ ..\EXTERN.h \ ..\perlvars.h \ |