Cleanups

2 files changed, 41 insertions, 30 deletions

diff --git a/source/blargg_endian.h b/source/blargg_endian.h
index 177a081..15482b4 100644
--- a/source/blargg_endian.h
+++ b/source/blargg_endian.h
@@ -15,29 +15,7 @@
 #define BLARGG_NONPORTABLE 1
 #endif
 
-/* BLARGG_COMPILER_HAS_BOOL: If 0, provides bool support for old compiler. If 1, */
-/* compiler is assumed to support bool. If undefined, availability is determined. */
-#ifndef BLARGG_COMPILER_HAS_BOOL
-   #if defined (__MWERKS__)
-      #if !__option(bool)
-         #define BLARGG_COMPILER_HAS_BOOL 0
-      #endif
-   #elif defined (_MSC_VER)
-      #if _MSC_VER < 1100
-         #define BLARGG_COMPILER_HAS_BOOL 0
-      #endif
-   #elif defined (__GNUC__)
-      /* supports bool */
-   #elif __cplusplus < 199711
-      #define BLARGG_COMPILER_HAS_BOOL 0
-   #endif
-#endif
-
-#if defined (BLARGG_COMPILER_HAS_BOOL) && !BLARGG_COMPILER_HAS_BOOL
-   typedef int bool;
-   const bool true  = 1;
-   const bool false = 0;
-#endif
+#include <boolean.h>
 
 #if UINT_MAX < 0xFFFFFFFF || ULONG_MAX == 0xFFFFFFFF
    typedef unsigned long blargg_ulong;
@@ -45,13 +23,7 @@
    typedef unsigned blargg_ulong;
 #endif
 
-/* HAVE_STDINT_H: If defined, use <stdint.h> for int8_t etc. */
-#if defined (HAVE_STDINT_H)
-   #include <stdint.h>
-/* HAVE_INTTYPES_H: If defined, use <stdint.h> for int8_t etc. */
-#elif defined (HAVE_INTTYPES_H)
-   #include <inttypes.h>
-#endif
+#include <stdint.h>
 
 /* BLARGG_CPU_CISC: Defined if CPU has very few general-purpose registers (< 16) */
 #if defined (_M_IX86) || defined (_M_IA64) || defined (__i486__) || \
diff --git a/source/boolean.h b/source/boolean.h
new file mode 100644
index 0000000..4d53907
--- /dev/null
+++ b/source/boolean.h
@@ -0,0 +1,39 @@
+/* Copyright  (C) 2010-2016 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (boolean.h).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __LIBRETRO_SDK_BOOLEAN_H
+#define __LIBRETRO_SDK_BOOLEAN_H
+
+#ifndef __cplusplus
+
+#if defined(_MSC_VER) && !defined(SN_TARGET_PS3)
+/* Hack applied for MSVC when compiling in C89 mode as it isn't C99 compliant. */
+#define bool unsigned char
+#define true 1
+#define false 0
+#else
+#include <stdbool.h>
+#endif
+
+#endif
+
+#endif