aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2007-11-22 17:47:28 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2007-11-22 17:47:28 +0000
commitf608f3b87b9f000c1ac168d9347f5d78bd2b69ae (patch)
treecd4c9d5b954da278d7aec315bafca6fb28bc650a /src
parentd9bc7a39465f10e63ad12685918db3c7bec562d1 (diff)
downloadpostgresql-f608f3b87b9f000c1ac168d9347f5d78bd2b69ae.tar.gz
postgresql-f608f3b87b9f000c1ac168d9347f5d78bd2b69ae.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.
Diffstat (limited to 'src')
-rw-r--r--src/pl/plperl/plperl.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/pl/plperl/plperl.h b/src/pl/plperl/plperl.h
index 27929fea3c9..7d1d26281ec 100644
--- a/src/pl/plperl/plperl.h
+++ b/src/pl/plperl/plperl.h
@@ -8,7 +8,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
* Portions Copyright (c) 1995, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/pl/plperl/plperl.h,v 1.6 2007/01/05 22:20:01 momjian Exp $
+ * $PostgreSQL: pgsql/src/pl/plperl/plperl.h,v 1.7 2007/11/22 17:47:28 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);