--- src/include/c.h.orig	2005-10-15 04:49:41.000000000 +0200
+++ src/include/c.h	2005-11-02 10:44:07.000000000 +0100
@@ -178,15 +178,19 @@
 
 #ifndef __cplusplus
 
-#ifndef bool
+#if defined(__APPLE__) && defined(__MACH__)
+#define MACOSX
+#endif
+
+#if !defined(bool) || defined(MACOSX)
 typedef char bool;
 #endif
 
-#ifndef true
+#if !defined(true) || defined(MACOSX)
 #define true	((bool) 1)
 #endif
 
-#ifndef false
+#if !defined(false) || defined(MACOSX)
 #define false	((bool) 0)
 #endif
 #endif   /* not C++ */
--- src/interfaces/ecpg/include/ecpglib.h.orig	2005-11-02 11:01:05.000000000 +0100
+++ src/interfaces/ecpg/include/ecpglib.h	2005-11-02 12:01:50.000000000 +0100
@@ -9,19 +9,27 @@
 #include "libpq-fe.h"
 #include "ecpgtype.h"
 #include <string.h>
-
 #ifndef __BEOS__
+#ifndef C_H
 #ifndef __cplusplus
-#ifndef bool
-#define bool char
+
+#if defined(__APPLE__) && defined(__MACH__)
+#define MACOSX
+#endif
+
+#if !defined(bool) || defined(MACOSX)
+typedef char bool;
 #endif   /* ndef bool */
 
-#ifndef true
+#if !defined(true) || defined(MACOSX)
 #define true	((bool) 1)
 #endif   /* ndef true */
-#ifndef false
+
+#if !defined(false) || defined(MACOSX)
 #define false	((bool) 0)
 #endif   /* ndef false */
+
+#endif   /* C_H */
 #endif   /* not C++ */
 #else							/* __BEOS__ */
 #include <SupportDefs.h>
--- src/interfaces/ecpg/pgtypeslib/extern.h.orig	2005-11-02 11:01:37.000000000 +0100
+++ src/interfaces/ecpg/pgtypeslib/extern.h	2005-11-02 12:03:14.000000000 +0100
@@ -37,10 +37,18 @@
 char	   *pgtypes_alloc(long);
 char	   *pgtypes_strdup(char *);
 
-#ifndef bool
+#ifndef C_H
+
+#if defined(__APPLE__) && defined(__MACH__)
+#define MACOSX
+#endif
+
+#if !defined(bool) || defined(MACOSX)
 #define bool char
 #endif   /* ndef bool */
 
+#endif   /* ndef C_H */
+
 #ifndef FALSE
 #define FALSE	0
 #endif   /* FALSE */
--- src/tools/thread/thread_test.c.orig	2005-11-02 10:44:30.000000000 +0100
+++ src/tools/thread/thread_test.c	2005-11-02 10:40:44.000000000 +0100
@@ -24,15 +24,19 @@
 #include "postgres.h"
 #else
 /* From src/include/c.h" */
-#ifndef bool
+#if defined(__APPLE__) && defined(__MACH__)
+#define MACOSX
+#endif
+
+#if !defined(bool) || defined(MACOSX)
 typedef char bool;
 #endif
 
-#ifndef true
+#if !defined(true) || defined(MACOSX)
 #define true	((bool) 1)
 #endif
 
-#ifndef false
+#if !defined(false) || defined(MACOSX)
 #define false	((bool) 0)
 #endif
 #endif