aboutsummaryrefslogtreecommitdiff
path: root/src/lj_clib.c
diff options
context:
space:
mode:
authorMike Pall <mike>2013-12-21 16:49:53 +0100
committerMike Pall <mike>2013-12-21 16:49:53 +0100
commitb03cebe1f60973a0b608489ab013d3f40dc10ae1 (patch)
treecae420c368d03865c3e61b67d5adbbc4b1a184af /src/lj_clib.c
parent585dd449b5d2a9599d268033cd3f62ce63a6be80 (diff)
parent279673ddfcff8e82cac0704d371ed405ad7a229b (diff)
downloadluajit-b03cebe1f60973a0b608489ab013d3f40dc10ae1.tar.gz
luajit-b03cebe1f60973a0b608489ab013d3f40dc10ae1.tar.bz2
luajit-b03cebe1f60973a0b608489ab013d3f40dc10ae1.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_clib.c')
-rw-r--r--src/lj_clib.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lj_clib.c b/src/lj_clib.c
index 4e01c5f1..f744c3a1 100644
--- a/src/lj_clib.c
+++ b/src/lj_clib.c
@@ -145,9 +145,6 @@ static void *clib_getsym(CLibrary *cl, const char *name)
145#elif LJ_TARGET_WINDOWS 145#elif LJ_TARGET_WINDOWS
146 146
147#define WIN32_LEAN_AND_MEAN 147#define WIN32_LEAN_AND_MEAN
148#ifndef WINVER
149#define WINVER 0x0500
150#endif
151#include <windows.h> 148#include <windows.h>
152 149
153#ifndef GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS 150#ifndef GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS