aboutsummaryrefslogtreecommitdiff
path: root/source/snes9x.h
diff options
context:
space:
mode:
authoraliaspider2014-10-29 06:47:46 +0100
committeraliaspider2014-10-29 06:47:46 +0100
commit761d752569b9bad6bdb755e91ca9e345cfb2788d (patch)
tree5eaa11c172c08039757d6bee1a3641e051462d3a /source/snes9x.h
parenta6dc7abc9b8cc3986eda5a84141da7dc9e4e8f1a (diff)
downloadsnes9x2005-761d752569b9bad6bdb755e91ca9e345cfb2788d.tar.gz
snes9x2005-761d752569b9bad6bdb755e91ca9e345cfb2788d.tar.bz2
snes9x2005-761d752569b9bad6bdb755e91ca9e345cfb2788d.zip
C++ cleanups. (in progress)
Diffstat (limited to 'source/snes9x.h')
-rw-r--r--source/snes9x.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/source/snes9x.h b/source/snes9x.h
index 95a38e3..1747389 100644
--- a/source/snes9x.h
+++ b/source/snes9x.h
@@ -95,16 +95,20 @@
#include <stdlib.h>
#include <stdint.h>
+#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
+
//#include "fs_api.h"
//#include "ds2_malloc.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
extern int cprintf(const char *fmt, ...);
-#ifdef __cplusplus
-}
-#endif
#ifdef __WIN32__
#include "..\wsnes9x.h"
@@ -392,7 +396,6 @@ struct SSNESGameFixes
bool8 EchoOnlyOutput;
};
-START_EXTERN_C
extern struct SSettings Settings;
extern struct SCPUState CPU;
extern struct SSNESGameFixes SNESGameFixes;
@@ -401,7 +404,6 @@ extern char String [513];
void S9xExit ();
void S9xMessage (int type, int number, const char *message);
void S9xLoadSDD1Data ();
-END_EXTERN_C
void S9xSetPause (uint32 mask);
void S9xClearPause (uint32 mask);