Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2013-12-21 16:49:53 +01:00
commit b03cebe1f6
4 changed files with 4 additions and 7 deletions

View File

@ -68,9 +68,6 @@ static const char *ll_bcsym(void *lib, const char *sym)
#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

View File

@ -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

View File

@ -22,7 +22,7 @@
#endif
#ifndef WINVER
#define WINVER 0x0500
#define WINVER 0x0501
#endif
#include "lua.h"

View File

@ -6,6 +6,9 @@
#ifndef luaconf_h
#define luaconf_h
#ifndef WINVER
#define WINVER 0x0501
#endif
#include <limits.h>
#include <stddef.h>