diff --git a/mozilla/modules/plugin/base/public/nptypes.h b/mozilla/modules/plugin/base/public/nptypes.h
index 228242091f8..98bac41ffc4 100644
--- a/mozilla/modules/plugin/base/public/nptypes.h
+++ b/mozilla/modules/plugin/base/public/nptypes.h
@@ -47,11 +47,18 @@ typedef unsigned int uint32_t;
 #else
 #include <stdint.h>
 
-#if !defined(__GNUC__) || (__GNUC__ > 2 && __GNUC_MINOR__ > 91)
+#if !defined(__GNUC__) || (__GNUC__ > 2 || __GNUC_MINOR__ > 91)
+
 #ifndef __cplusplus
+
 #ifndef bool
 typedef int bool;
 #endif /* bool */
+
 #endif /* __cplusplus */
-#endif /* !defined(__GNUC__) || (__GNUC__ > 2 && __GNUC_MINOR__ > 96) */
+
+#else
+#define bool int
+#endif
+
 #endif