Merge branch 'master' into v2.1

2013-12-21 16:49:53 +01:00
parent 585dd449b5 279673ddfc
commit b03cebe1f6
4 changed files with 4 additions and 7 deletions
--- a/src/lj_clib.c
+++ b/src/lj_clib.c
@@ -145,9 +145,6 @@ static void *clib_getsym(CLibrary *cl, const char *name)
 #elif LJ_TARGET_WINDOWS

 #define WIN32_LEAN_AND_MEAN
-#ifndef WINVER
-#define WINVER 0x0500
-#endif
 #include <windows.h>

 #ifndef GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS