Merge branch 'bugfix/winxp_stack_align'

This commit is contained in:
Lukas Dürrenberger 2014-08-12 09:45:59 +02:00
commit 7ace90986b

View File

@ -31,6 +31,17 @@
#include <SFML/System/NonCopyable.hpp>
#include <windows.h>
// Fix for unaligned stack with clang and GCC on Windows XP 32-bit
#if defined(SFML_SYSTEM_WINDOWS) && (defined(__clang__) || defined(__GNUC__))
#define ALIGN_STACK __attribute__((__force_align_arg_pointer__))
#else
#define ALIGN_STACK
#endif
namespace sf
{
@ -81,7 +92,7 @@ private :
/// \return OS specific error code
///
////////////////////////////////////////////////////////////
static unsigned int __stdcall entryPoint(void* userData);
ALIGN_STACK static unsigned int __stdcall entryPoint(void* userData);
////////////////////////////////////////////////////////////
// Member data