From a07b8587f16b366c70dd3660b0809df33cd38cc1 Mon Sep 17 00:00:00 2001
From: Zachary Slater <zachary@ioquake.org>
Date: Tue, 10 Apr 2012 06:44:04 +0000
Subject: [PATCH] updating SDL includes to 1.2.15 Listen to this if this
 doesn't work out properly:
 http://timedoctor.org/fun/swf/starwars/tauntaun-soundboard.swf

---
 code/SDL12/include/SDL.h                  |  2 +-
 code/SDL12/include/SDL_active.h           |  2 +-
 code/SDL12/include/SDL_audio.h            |  2 +-
 code/SDL12/include/SDL_byteorder.h        |  2 +-
 code/SDL12/include/SDL_cdrom.h            |  2 +-
 code/SDL12/include/SDL_config_dreamcast.h |  2 +-
 code/SDL12/include/SDL_config_macos.h     |  2 +-
 code/SDL12/include/SDL_config_macosx.h    |  2 +-
 code/SDL12/include/SDL_config_minimal.h   |  2 +-
 code/SDL12/include/SDL_config_nds.h       |  2 +-
 code/SDL12/include/SDL_config_os2.h       |  2 +-
 code/SDL12/include/SDL_config_symbian.h   |  2 +-
 code/SDL12/include/SDL_config_win32.h     |  2 +-
 code/SDL12/include/SDL_copying.h          |  2 +-
 code/SDL12/include/SDL_cpuinfo.h          |  2 +-
 code/SDL12/include/SDL_endian.h           | 21 +++++++++++++--------
 code/SDL12/include/SDL_error.h            |  2 +-
 code/SDL12/include/SDL_events.h           |  2 +-
 code/SDL12/include/SDL_getenv.h           |  2 +-
 code/SDL12/include/SDL_joystick.h         |  2 +-
 code/SDL12/include/SDL_keyboard.h         |  2 +-
 code/SDL12/include/SDL_keysym.h           |  2 +-
 code/SDL12/include/SDL_loadso.h           |  2 +-
 code/SDL12/include/SDL_main.h             |  2 +-
 code/SDL12/include/SDL_mouse.h            |  2 +-
 code/SDL12/include/SDL_mutex.h            |  2 +-
 code/SDL12/include/SDL_opengl.h           | 16 +++++++++++++++-
 code/SDL12/include/SDL_platform.h         |  2 +-
 code/SDL12/include/SDL_quit.h             |  2 +-
 code/SDL12/include/SDL_rwops.h            |  2 +-
 code/SDL12/include/SDL_stdinc.h           |  2 +-
 code/SDL12/include/SDL_syswm.h            |  9 +++++----
 code/SDL12/include/SDL_thread.h           |  7 +------
 code/SDL12/include/SDL_timer.h            |  2 +-
 code/SDL12/include/SDL_types.h            |  2 +-
 code/SDL12/include/SDL_version.h          |  4 ++--
 code/SDL12/include/SDL_video.h            |  2 +-
 code/SDL12/include/begin_code.h           |  9 +++++++--
 code/SDL12/include/close_code.h           |  2 +-
 39 files changed, 76 insertions(+), 56 deletions(-)

diff --git a/code/SDL12/include/SDL.h b/code/SDL12/include/SDL.h
index 119ed7ff..6087b7cd 100644
--- a/code/SDL12/include/SDL.h
+++ b/code/SDL12/include/SDL.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_active.h b/code/SDL12/include/SDL_active.h
index 0ae92f2d..cd854e89 100644
--- a/code/SDL12/include/SDL_active.h
+++ b/code/SDL12/include/SDL_active.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_audio.h b/code/SDL12/include/SDL_audio.h
index 3a8e7fa8..e879c989 100644
--- a/code/SDL12/include/SDL_audio.h
+++ b/code/SDL12/include/SDL_audio.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_byteorder.h b/code/SDL12/include/SDL_byteorder.h
index 9b93cd69..47332c3d 100644
--- a/code/SDL12/include/SDL_byteorder.h
+++ b/code/SDL12/include/SDL_byteorder.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_cdrom.h b/code/SDL12/include/SDL_cdrom.h
index fff5cfa1..febb19dc 100644
--- a/code/SDL12/include/SDL_cdrom.h
+++ b/code/SDL12/include/SDL_cdrom.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_config_dreamcast.h b/code/SDL12/include/SDL_config_dreamcast.h
index 07c2f081..fb03098e 100644
--- a/code/SDL12/include/SDL_config_dreamcast.h
+++ b/code/SDL12/include/SDL_config_dreamcast.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_config_macos.h b/code/SDL12/include/SDL_config_macos.h
index 4ba5c22c..4fe1715a 100644
--- a/code/SDL12/include/SDL_config_macos.h
+++ b/code/SDL12/include/SDL_config_macos.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_config_macosx.h b/code/SDL12/include/SDL_config_macosx.h
index 295b8724..84be6177 100644
--- a/code/SDL12/include/SDL_config_macosx.h
+++ b/code/SDL12/include/SDL_config_macosx.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_config_minimal.h b/code/SDL12/include/SDL_config_minimal.h
index 002c56ea..d10db7c6 100644
--- a/code/SDL12/include/SDL_config_minimal.h
+++ b/code/SDL12/include/SDL_config_minimal.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_config_nds.h b/code/SDL12/include/SDL_config_nds.h
index 4ac60a50..cb4d61f6 100644
--- a/code/SDL12/include/SDL_config_nds.h
+++ b/code/SDL12/include/SDL_config_nds.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_config_os2.h b/code/SDL12/include/SDL_config_os2.h
index bb40df00..42edd20e 100644
--- a/code/SDL12/include/SDL_config_os2.h
+++ b/code/SDL12/include/SDL_config_os2.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_config_symbian.h b/code/SDL12/include/SDL_config_symbian.h
index 53527b23..e917ac6e 100644
--- a/code/SDL12/include/SDL_config_symbian.h
+++ b/code/SDL12/include/SDL_config_symbian.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_config_win32.h b/code/SDL12/include/SDL_config_win32.h
index 6d019a8d..da2c15dd 100644
--- a/code/SDL12/include/SDL_config_win32.h
+++ b/code/SDL12/include/SDL_config_win32.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_copying.h b/code/SDL12/include/SDL_copying.h
index 1bd6b84c..b5b64f29 100644
--- a/code/SDL12/include/SDL_copying.h
+++ b/code/SDL12/include/SDL_copying.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_cpuinfo.h b/code/SDL12/include/SDL_cpuinfo.h
index f4be8e03..4200d6d1 100644
--- a/code/SDL12/include/SDL_cpuinfo.h
+++ b/code/SDL12/include/SDL_cpuinfo.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_endian.h b/code/SDL12/include/SDL_endian.h
index f7a2e2f8..068da918 100644
--- a/code/SDL12/include/SDL_endian.h
+++ b/code/SDL12/include/SDL_endian.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -39,6 +39,10 @@
 /*@}*/
 
 #ifndef SDL_BYTEORDER	/* Not defined in SDL_config.h? */
+#ifdef __linux__
+#include <endian.h>
+#define SDL_BYTEORDER  __BYTE_ORDER
+#else /* __linux __ */
 #if defined(__hppa__) || \
     defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
     (defined(__MIPS__) && defined(__MISPEB__)) || \
@@ -48,6 +52,7 @@
 #else
 #define SDL_BYTEORDER	SDL_LIL_ENDIAN
 #endif
+#endif /* __linux __ */
 #endif /* !SDL_BYTEORDER */
 
 
@@ -81,12 +86,12 @@ static __inline__ Uint16 SDL_Swap16(Uint16 x)
 #elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
 static __inline__ Uint16 SDL_Swap16(Uint16 x)
 {
-	Uint16 result;
+	int result;
 
 	__asm__("rlwimi %0,%2,8,16,23" : "=&r" (result) : "0" (x >> 8), "r" (x));
-	return result;
+	return (Uint16)result;
 }
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
+#elif defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__))
 static __inline__ Uint16 SDL_Swap16(Uint16 x)
 {
 	__asm__("rorw #8,%0" : "=d" (x) :  "0" (x) : "cc");
@@ -94,7 +99,7 @@ static __inline__ Uint16 SDL_Swap16(Uint16 x)
 }
 #else
 static __inline__ Uint16 SDL_Swap16(Uint16 x) {
-	return((x<<8)|(x>>8));
+	return SDL_static_cast(Uint16, ((x<<8)|(x>>8)));
 }
 #endif
 
@@ -121,7 +126,7 @@ static __inline__ Uint32 SDL_Swap32(Uint32 x)
 	__asm__("rlwimi %0,%2,24,0,7"   : "=&r" (result) : "0" (result),    "r" (x));
 	return result;
 }
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
+#elif defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__))
 static __inline__ Uint32 SDL_Swap32(Uint32 x)
 {
 	__asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0" : "=d" (x) :  "0" (x) : "cc");
@@ -129,7 +134,7 @@ static __inline__ Uint32 SDL_Swap32(Uint32 x)
 }
 #else
 static __inline__ Uint32 SDL_Swap32(Uint32 x) {
-	return((x<<24)|((x<<8)&0x00FF0000)|((x>>8)&0x0000FF00)|(x>>24));
+	return SDL_static_cast(Uint32, ((x<<24)|((x<<8)&0x00FF0000)|((x>>8)&0x0000FF00)|(x>>24)));
 }
 #endif
 
@@ -166,7 +171,7 @@ static __inline__ Uint64 SDL_Swap64(Uint64 x)
 	x = SDL_Swap32(lo);
 	x <<= 32;
 	x |= SDL_Swap32(hi);
-	return(x);
+	return (x);
 }
 #endif
 #else
diff --git a/code/SDL12/include/SDL_error.h b/code/SDL12/include/SDL_error.h
index b103703a..4e1cce3b 100644
--- a/code/SDL12/include/SDL_error.h
+++ b/code/SDL12/include/SDL_error.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_events.h b/code/SDL12/include/SDL_events.h
index c94a30c9..94b42025 100644
--- a/code/SDL12/include/SDL_events.h
+++ b/code/SDL12/include/SDL_events.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_getenv.h b/code/SDL12/include/SDL_getenv.h
index 253ad88c..bea63007 100644
--- a/code/SDL12/include/SDL_getenv.h
+++ b/code/SDL12/include/SDL_getenv.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_joystick.h b/code/SDL12/include/SDL_joystick.h
index d5135c3d..708d1a9f 100644
--- a/code/SDL12/include/SDL_joystick.h
+++ b/code/SDL12/include/SDL_joystick.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_keyboard.h b/code/SDL12/include/SDL_keyboard.h
index 7b59d24e..9d7129c5 100644
--- a/code/SDL12/include/SDL_keyboard.h
+++ b/code/SDL12/include/SDL_keyboard.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_keysym.h b/code/SDL12/include/SDL_keysym.h
index 90101286..f2ad12b8 100644
--- a/code/SDL12/include/SDL_keysym.h
+++ b/code/SDL12/include/SDL_keysym.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_loadso.h b/code/SDL12/include/SDL_loadso.h
index 45a17f9f..0c5e5362 100644
--- a/code/SDL12/include/SDL_loadso.h
+++ b/code/SDL12/include/SDL_loadso.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_main.h b/code/SDL12/include/SDL_main.h
index b7f6b2c8..ab50ef1e 100644
--- a/code/SDL12/include/SDL_main.h
+++ b/code/SDL12/include/SDL_main.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_mouse.h b/code/SDL12/include/SDL_mouse.h
index a573f04e..7c563b94 100644
--- a/code/SDL12/include/SDL_mouse.h
+++ b/code/SDL12/include/SDL_mouse.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_mutex.h b/code/SDL12/include/SDL_mutex.h
index 920971df..c8da9b1a 100644
--- a/code/SDL12/include/SDL_mutex.h
+++ b/code/SDL12/include/SDL_mutex.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_opengl.h b/code/SDL12/include/SDL_opengl.h
index c479a3a4..3d791d69 100644
--- a/code/SDL12/include/SDL_opengl.h
+++ b/code/SDL12/include/SDL_opengl.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -3108,21 +3108,35 @@ typedef char GLchar;			/* native character */
 
 #ifndef GL_VERSION_1_5
 /* GL types for handling large vertex buffer objects */
+#ifdef __APPLE__
+typedef long GLintptr;
+typedef long GLsizeiptr;
+#else
 typedef ptrdiff_t GLintptr;
 typedef ptrdiff_t GLsizeiptr;
 #endif
+#endif
 
 #ifndef GL_ARB_vertex_buffer_object
 /* GL types for handling large vertex buffer objects */
+#ifdef __APPLE__
+typedef long GLintptrARB;
+typedef long GLsizeiptrARB;
+#else
 typedef ptrdiff_t GLintptrARB;
 typedef ptrdiff_t GLsizeiptrARB;
 #endif
+#endif
 
 #ifndef GL_ARB_shader_objects
 /* GL types for handling shader object handles and program/shader text */
 typedef char GLcharARB;		/* native character */
+#if defined(__APPLE__)
+typedef void *GLhandleARB;	/* shader object handle */
+#else
 typedef unsigned int GLhandleARB;	/* shader object handle */
 #endif
+#endif
 
 /* GL types for "half" precision (s10e5) float data in host memory */
 #ifndef GL_ARB_half_float_pixel
diff --git a/code/SDL12/include/SDL_platform.h b/code/SDL12/include/SDL_platform.h
index 11d86736..48540a85 100644
--- a/code/SDL12/include/SDL_platform.h
+++ b/code/SDL12/include/SDL_platform.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_quit.h b/code/SDL12/include/SDL_quit.h
index 6d82e7e0..abd2ec6c 100644
--- a/code/SDL12/include/SDL_quit.h
+++ b/code/SDL12/include/SDL_quit.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_rwops.h b/code/SDL12/include/SDL_rwops.h
index a450119f..98361d7e 100644
--- a/code/SDL12/include/SDL_rwops.h
+++ b/code/SDL12/include/SDL_rwops.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_stdinc.h b/code/SDL12/include/SDL_stdinc.h
index e1f85fb7..35a4fdde 100644
--- a/code/SDL12/include/SDL_stdinc.h
+++ b/code/SDL12/include/SDL_stdinc.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_syswm.h b/code/SDL12/include/SDL_syswm.h
index 716dddcb..78433c6a 100644
--- a/code/SDL12/include/SDL_syswm.h
+++ b/code/SDL12/include/SDL_syswm.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -203,12 +203,13 @@ typedef struct SDL_SysWMinfo {
 /**
  * This function gives you custom hooks into the window manager information.
  * It fills the structure pointed to by 'info' with custom information and
- * returns 1 if the function is implemented.  If it's not implemented, or
- * the version member of the 'info' structure is invalid, it returns 0. 
+ * returns 0 if the function is not implemented, 1 if the function is 
+ * implemented and no error occurred, and -1 if the version member of
+ * the 'info' structure is not filled in or not supported.
  *
  * You typically use this function like this:
  * @code
- * SDL_SysWMInfo info;
+ * SDL_SysWMinfo info;
  * SDL_VERSION(&info.version);
  * if ( SDL_GetWMInfo(&info) ) { ... }
  * @endcode
diff --git a/code/SDL12/include/SDL_thread.h b/code/SDL12/include/SDL_thread.h
index 1ca9a1bc..9ebe00ed 100644
--- a/code/SDL12/include/SDL_thread.h
+++ b/code/SDL12/include/SDL_thread.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -68,11 +68,6 @@ typedef struct SDL_Thread SDL_Thread;
 #ifdef __OS2__
 typedef int (*pfnSDL_CurrentBeginThread)(void (*func)(void *), void *, unsigned, void *arg); 
 typedef void (*pfnSDL_CurrentEndThread)(void);
-#elif __GNUC__
-typedef unsigned long (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
-        unsigned (__stdcall *func)(void *), void *arg, 
-        unsigned, unsigned *threadID);
-typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);
 #else
 typedef uintptr_t (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
         unsigned (__stdcall *func)(void *), void *arg, 
diff --git a/code/SDL12/include/SDL_timer.h b/code/SDL12/include/SDL_timer.h
index d7cd0246..d764d5f3 100644
--- a/code/SDL12/include/SDL_timer.h
+++ b/code/SDL12/include/SDL_timer.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_types.h b/code/SDL12/include/SDL_types.h
index cfa35236..79d8b28d 100644
--- a/code/SDL12/include/SDL_types.h
+++ b/code/SDL12/include/SDL_types.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/SDL_version.h b/code/SDL12/include/SDL_version.h
index fa02c3f6..fdc17c64 100644
--- a/code/SDL12/include/SDL_version.h
+++ b/code/SDL12/include/SDL_version.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@ extern "C" {
 /*@{*/
 #define SDL_MAJOR_VERSION	1
 #define SDL_MINOR_VERSION	2
-#define SDL_PATCHLEVEL		14
+#define SDL_PATCHLEVEL		15
 /*@}*/
 
 typedef struct SDL_version {
diff --git a/code/SDL12/include/SDL_video.h b/code/SDL12/include/SDL_video.h
index 8f7f3052..f9c4e070 100644
--- a/code/SDL12/include/SDL_video.h
+++ b/code/SDL12/include/SDL_video.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/code/SDL12/include/begin_code.h b/code/SDL12/include/begin_code.h
index 22748090..27e2f7bc 100644
--- a/code/SDL12/include/begin_code.h
+++ b/code/SDL12/include/begin_code.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -43,7 +43,7 @@
 #ifndef DECLSPEC
 # if defined(__BEOS__) || defined(__HAIKU__)
 #  if defined(__GNUC__)
-#   define DECLSPEC	__declspec(dllexport)
+#   define DECLSPEC
 #  else
 #   define DECLSPEC	__declspec(export)
 #  endif
@@ -132,7 +132,12 @@
 #ifdef __BORLANDC__
 #pragma nopackwarning
 #endif
+#ifdef _M_X64
+/* Use 8-byte alignment on 64-bit architectures, so pointers are aligned */
+#pragma pack(push,8)
+#else
 #pragma pack(push,4)
+#endif
 #elif (defined(__MWERKS__) && defined(__MACOS__))
 #pragma options align=mac68k4byte
 #pragma enumsalwaysint on
diff --git a/code/SDL12/include/close_code.h b/code/SDL12/include/close_code.h
index 46a07208..19a00246 100644
--- a/code/SDL12/include/close_code.h
+++ b/code/SDL12/include/close_code.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public