Moved to SDL 1.3, it compiles but DOES NOT WORK, audio is disabled

alienblaster/project/jni/sdl/include/SDL_platform.h

@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2010 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -20,8 +20,10 @@
     slouken@libsdl.org
 */
 
-/** @file SDL_platform.h
- *  Try to get a standard set of platform defines
+/**
+ *  \file SDL_platform.h
+ *  
+ *  Try to get a standard set of platform defines.
  */
 
 #ifndef _SDL_platform_h
@@ -37,7 +39,7 @@
 #endif
 #if defined(__HAIKU__)
 #undef __HAIKU__
-#define __HAIKU__ 1
+#define __HAIKU__	1
 #endif
 #if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
 #undef __BSDI__
@@ -51,10 +53,6 @@
 #undef __FREEBSD__
 #define __FREEBSD__	1
 #endif
-#if defined(__HAIKU__)
-#undef __HAIKU__
-#define __HAIKU__	1
-#endif
 #if defined(hpux) || defined(__hpux) || defined(__hpux__)
 #undef __HPUX__
 #define __HPUX__	1
@@ -67,13 +65,30 @@
 #undef __LINUX__
 #define __LINUX__	1
 #endif
+
 #if defined(__APPLE__)
+/* lets us know what version of Mac OS X we're compiling on */
+#include "AvailabilityMacros.h"
+#ifdef MAC_OS_X_VERSION_10_3
+#include "TargetConditionals.h" /* this header is in 10.3 or later */
+#if TARGET_OS_IPHONE
+/* if compiling for iPhone */
+#undef __IPHONEOS__
+#define __IPHONEOS__ 1
+#undef __MACOSX__
+#else
+/* if not compiling for iPhone */
+#undef __MACOSX__
+#define __MACOSX__	1
+#endif /* TARGET_OS_IPHONE */
+#else
+/* if earlier verion of Mac OS X than version 10.3 */
 #undef __MACOSX__
 #define __MACOSX__	1
-#elif defined(macintosh)
-#undef __MACOS__
-#define __MACOS__	1
 #endif
+
+#endif /* defined(__APPLE__) */
+
 #if defined(__NetBSD__)
 #undef __NETBSD__
 #define __NETBSD__	1
@@ -107,4 +122,33 @@
 #define __WIN32__	1
 #endif
 
+#if defined(__NDS__)
+#undef __NINTENDODS__
+#define __NINTENDODS__	1
+#endif
+
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+/* *INDENT-OFF* */
+extern "C" {
+/* *INDENT-ON* */
+#endif
+
+/**
+ *  \brief Gets the name of the platform.
+ */
+extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+/* *INDENT-OFF* */
+}
+/* *INDENT-ON* */
+#endif
+#include "close_code.h"
+
 #endif /* _SDL_platform_h */
+
+/* vi: set ts=4 sw=4 expandtab: */