diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-11-22 17:47:32 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-11-22 17:47:32 +0000 |
| commit | b974b5f223780f3b1b2e7e1bb1feb4db0489b1e3 (patch) | |
| tree | 9918c8f6ed638c78d285ef2ddf553cd27a480a96 | |
| parent | 5a4a7d624a51d4a9747bbb3df126802f9df44f4a (diff) | |
| download | postgresql-b974b5f223780f3b1b2e7e1bb1feb4db0489b1e3.tar.gz postgresql-b974b5f223780f3b1b2e7e1bb1feb4db0489b1e3.zip | |
Prevent Perl from introducing a possibly-incompatible definition of type
"bool" into plperl.c. This has always been a hazard since Perl allows a
platform-specific choice to define bool as int rather than char, but
evidently this didn't happen on any platform we support ... until OS X 10.5.
Per report from Brandon Maust.
Back-patch as far as 8.0 --- a bit arbitrary, but it seems unlikely anyone
will be trying to port 7.x onto new platforms.
| -rw-r--r-- | src/pl/plperl/plperl.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/pl/plperl/plperl.h b/src/pl/plperl/plperl.h index 8feccb45cd3..c8aa185a3b6 100644 --- a/src/pl/plperl/plperl.h +++ b/src/pl/plperl/plperl.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1995, Regents of the University of California * - * $PostgreSQL: pgsql/src/pl/plperl/plperl.h,v 1.5 2006/10/04 00:30:13 momjian Exp $ + * $PostgreSQL: pgsql/src/pl/plperl/plperl.h,v 1.5.2.1 2007/11/22 17:47:32 tgl Exp $ */ #ifndef PL_PERL_H @@ -38,6 +38,11 @@ #define pTHX void #endif +/* perl may have a different width of "bool", don't buy it */ +#ifdef bool +#undef bool +#endif + /* routines from spi_internal.c */ int spi_DEBUG(void); int spi_LOG(void); |