Patched to compile (missing #endif from a mismerge). Thanks to Peter Mackay

 for pointing it out.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402392

include/SDL_config_win32.h

@@ -45,6 +45,7 @@ typedef unsigned __int64 uintptr_t;
 typedef unsigned int uintptr_t;
 #endif
 #define _UINTPTR_T_DEFINED
+#endif
 /* Older Visual C++ headers don't have the Win64-compatible typedefs... */
 #if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR)))
 #define DWORD_PTR DWORD