Use PERL=../miniperl

[p5sagit/p5-mst-13.2.git] / handy.h

diff --git a/handy.h b/handy.h
index d95c3da..aa4107e 100644 (file)
--- a/handy.h
+++ b/handy.h
@@ -23,14 +23,27 @@
 #define Nullfp Null(FILE*)
 #define Nullsv Null(SV*)
 
-/* bool is built-in for g++-2.6.3, which might be used for an extension. */
-#if !defined(HAS_BOOL) && !defined(_G_HAVE_BOOL)
-#ifdef UTS
-#define bool int
-#else
-#define bool char
+/* bool is built-in for g++-2.6.3, which might be used for an extension.
+   If the extension includes <_G_config.h> before this file then
+   _G_HAVE_BOOL will be properly set.  If, however, the extension includes
+   this file first, then you will have to manually set -DHAS_BOOL in 
+   your command line to avoid a conflict.
+*/
+#ifdef _G_HAVE_BOOL
+# if _G_HAVE_BOOL
+#  ifndef HAS_BOOL
+#   define HAS_BOOL 1
+#  endif
+# endif
+#endif
+
+#ifndef HAS_BOOL
+# ifdef UTS
+#  define bool int
+# else
+#  define bool char
+# endif
 #endif
-#endif /* !defined(HAS_BOOL) && !defined(_G_HAVE_BOOL) */
 
 #ifdef TRUE
 #undef TRUE