summaryrefslogtreecommitdiff
path: root/dom/plugins/base/nptypes.h
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2022-03-02 21:23:45 +0000
committerMoonchild <moonchild@palemoon.org>2022-03-02 21:23:45 +0000
commit5fe31b024217a7057db60c52d8fb535cc2bc05a3 (patch)
tree1d8272b66c35248b34d2df6f172c10a9ed1c57d3 /dom/plugins/base/nptypes.h
parent39e80ed9afe2e5bba65a2786c7eff7c3189d49e8 (diff)
parent872bfa373ddfc184e17caf1ba38dbb02ed9c37f0 (diff)
downloadGRE-5fe31b024217a7057db60c52d8fb535cc2bc05a3.tar.gz
Merge branch 'remove-hacks'
Diffstat (limited to 'dom/plugins/base/nptypes.h')
-rw-r--r--dom/plugins/base/nptypes.h19
1 files changed, 3 insertions, 16 deletions
diff --git a/dom/plugins/base/nptypes.h b/dom/plugins/base/nptypes.h
index d0cef6540..1f8eba3c5 100644
--- a/dom/plugins/base/nptypes.h
+++ b/dom/plugins/base/nptypes.h
@@ -13,7 +13,7 @@
#if defined(WIN32)
/*
- * Win32 and OS/2 don't know C99, so define [u]int_16/32/64 here. The bool
+ * Win32 doesn't know C99, so define [u]int_16/32/64 here. The bool
* is predefined tho, both in C and C++.
*/
typedef short int16_t;
@@ -61,28 +61,15 @@
#include <inttypes.h>
#include <stdbool.h>
#endif
-#elif defined(BEOS)
- #include <inttypes.h>
#else
/*
* For those that ship a standard C99 stdint.h header file, include
- * it. Can't do the same for stdbool.h tho, since some systems ship
- * with a stdbool.h file that doesn't compile!
+ * it.
*/
#include <stdint.h>
#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
- #define true 1
- #define false 0
- #endif
+ #include <stdbool.h>
#endif
#endif