From 6ef51f82b9d2f2a58aa211ddabb632657ab9bb76 Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu"
 <bzbarsky%mit.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 8 Oct 2005 03:02:20 +0000
Subject: [PATCH] Fix bug 297832.  Patch by David H. Gutteridge
 <dhgutteridge@hotmail.com>, r+sr=jst

git-svn-id: svn://10.0.0.236/trunk@181809 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/modules/plugin/base/public/nptypes.h | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/mozilla/modules/plugin/base/public/nptypes.h b/mozilla/modules/plugin/base/public/nptypes.h
index a05d3956576..051ccd705e4 100644
--- a/mozilla/modules/plugin/base/public/nptypes.h
+++ b/mozilla/modules/plugin/base/public/nptypes.h
@@ -93,13 +93,15 @@
    */
   #include <stdint.h>
 
-  #if !defined(__GNUC__) || (__GNUC__ > 2 || __GNUC_MINOR__ > 95)
-    #include <stdbool.h>
-  #else
-    /*
-     * GCC 2.91 can't deal with a typedef for bool, but a #define
-     * works.
-     */
-    #define bool int
+  #ifndef __cplusplus
+    #if !defined(__GNUC__) || (__GNUC__ > 2 || __GNUC_MINOR__ > 95)
+      #include <stdbool.h>
+    #else
+      /*
+       * GCC 2.91 can't deal with a typedef for bool, but a #define
+       * works.
+       */
+      #define bool int
+    #endif
   #endif
 #endif