Merge branch 'master' into 8bitsound

Conflicts:
	source/nds/entry.cpp

1 files changed, 45 insertions, 0 deletions

diff --git a/sdk-modifications/include/ds2_types.h b/sdk-modifications/include/ds2_types.h
new file mode 100755
index 0000000..3ec59bf
--- /dev/null
+++ b/sdk-modifications/include/ds2_types.h
@@ -0,0 +1,45 @@
+#ifndef __DS2_TYPES_H__
+#define __DS2_TYPES_H__
+
+#ifndef u8
+#define u8	unsigned char
+#endif
+
+#ifndef s8
+#define s8	char
+#endif
+
+#ifndef u16
+#define u16	unsigned short
+#endif
+
+#ifndef s16
+#define s16	short
+#endif
+
+#ifndef u32
+#define u32 unsigned int
+#endif
+
+#ifndef s32
+#define s32 int
+#endif
+
+#ifndef u64
+#define u64 unsigned long long
+#endif
+
+#ifndef s64
+#define s64 long long
+#endif 
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+#ifndef TRUE
+#define TRUE 1
+#define FALSE 0
+#endif
+
+#endif //__DS2_TYPES_H__