diff options
| author | Zachary Slater <zachary@ioquake.org> | 2012-04-10 06:44:04 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-12 20:21:21 +0000 |
| commit | 6d82447b7ec04dafc49561b48e6440e12c219461 (patch) | |
| tree | 8dab38911f976435f9b86615ff11eb68f12cf5e4 /src/SDL12/include/begin_code.h | |
| parent | d0b61b82f0b376128371a29cfd6eacfe2cd0c470 (diff) | |
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
Diffstat (limited to 'src/SDL12/include/begin_code.h')
| -rw-r--r-- | src/SDL12/include/begin_code.h | 9 |
1 files changed, 7 insertions, 2 deletions
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 |