From 6d82447b7ec04dafc49561b48e6440e12c219461 Mon Sep 17 00:00:00 2001
From: Zachary Slater <zachary@ioquake.org>
Date: Tue, 10 Apr 2012 06:44:04 +0000
Subject: 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

---
 src/SDL12/include/begin_code.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/SDL12/include/begin_code.h')

diff --git a/src/SDL12/include/begin_code.h b/src/SDL12/include/begin_code.h
index 22748090..27e2f7bc 100644
--- a/src/SDL12/include/begin_code.h
+++ b/src/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
-- 
cgit