diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2006-06-01 03:47:34 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2006-06-01 03:47:34 +0000 |
| commit | 9b3d3e9baf1e1133cf5afa80bef7260d467964dc (patch) | |
| tree | c03de4b205a0428a08dcd564bac269aa53adf687 /src | |
| parent | 1252a6a0428a42afbf11fd02610ff0fd98bd0410 (diff) | |
| download | postgresql-9b3d3e9baf1e1133cf5afa80bef7260d467964dc.tar.gz postgresql-9b3d3e9baf1e1133cf5afa80bef7260d467964dc.zip | |
Back-port recent ppport.h fix to 8.0 branch.
Diffstat (limited to 'src')
| -rw-r--r-- | src/pl/plperl/ppport.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pl/plperl/ppport.h b/src/pl/plperl/ppport.h index 592908f27fe..8c51dbbd538 100644 --- a/src/pl/plperl/ppport.h +++ b/src/pl/plperl/ppport.h @@ -221,6 +221,7 @@ __DATA__ /* Replace: 0 */ #endif +#ifndef PERL_UNUSED_DECL #ifdef HASATTRIBUTE #if (defined(__GNUC__) && defined(__cplusplus)) || defined(__INTEL_COMPILER) #define PERL_UNUSED_DECL @@ -230,6 +231,7 @@ __DATA__ #else #define PERL_UNUSED_DECL #endif +#endif #ifndef dNOOP #define NOOP (void)0 @@ -351,7 +353,6 @@ newRV_noinc(SV *sv) SvREFCNT_dec(sv); return nsv; } - #else #define newRV_noinc(sv) \ (PL_Sv=(SV*)newRV(sv), SvREFCNT_dec(sv), (SV*)PL_Sv) @@ -404,8 +405,8 @@ SV *sv; #endif newSVOP(OP_CONST, 0, newSVpv(name, 0)), - newSVOP(OP_CONST, 0, &PL_sv_no), /* SvPV(&PL_sv_no) == "" - * -- GMB */ + newSVOP(OP_CONST, 0, &PL_sv_no), /* SvPV(&PL_sv_no) == "" -- + * GMB */ newSTATEOP(0, Nullch, newSVOP(OP_CONST, 0, sv)) ); @@ -484,7 +485,6 @@ SV *sv; #define aMY_CXT my_cxtp #define aMY_CXT_ aMY_CXT, #define _aMY_CXT ,aMY_CXT - #else /* single interpreter */ #define START_MY_CXT static my_cxt_t my_cxt; |