From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 22 Nov 2007 17:47:46 +0000 (+0000)
Subject: Prevent Perl from introducing a possibly-incompatible definition of type
X-Git-Tag: REL8_0_15~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dfd7208424e55a391ab9f2924d752055580d2ba0;p=thirdparty%2Fpostgresql.git

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.
---

diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index bf0cccf9e75..a3ab05b4f85 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -33,7 +33,7 @@
  *	  ENHANCEMENTS, OR MODIFICATIONS.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.67.4.7 2007/06/28 17:50:24 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.67.4.8 2007/11/22 17:47:46 tgl Exp $
  *
  **********************************************************************/
 
@@ -70,6 +70,11 @@
 #define pTHX void
 #endif
 
+/* perl may have a different width of "bool", don't buy it */
+#ifdef bool
+#undef bool
+#endif
+
 
 /**********************************************************************
  * The information we cache about loaded procedures
diff --git a/src/pl/plperl/spi_internal.h b/src/pl/plperl/spi_internal.h
index b66f43eb2ec..628b4143fcb 100644
--- a/src/pl/plperl/spi_internal.h
+++ b/src/pl/plperl/spi_internal.h
@@ -3,6 +3,11 @@
 #include "XSUB.h"
 #include "ppport.h"
 
+/* perl may have a different width of "bool", don't buy it */
+#ifdef bool
+#undef bool
+#endif
+
 int			spi_DEBUG(void);
 
 int			spi_LOG(void);