diff options
| author | Mike Pall <mike> | 2013-12-21 16:49:53 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-12-21 16:49:53 +0100 |
| commit | b03cebe1f60973a0b608489ab013d3f40dc10ae1 (patch) | |
| tree | cae420c368d03865c3e61b67d5adbbc4b1a184af | |
| parent | 585dd449b5d2a9599d268033cd3f62ce63a6be80 (diff) | |
| parent | 279673ddfcff8e82cac0704d371ed405ad7a229b (diff) | |
| download | luajit-b03cebe1f60973a0b608489ab013d3f40dc10ae1.tar.gz luajit-b03cebe1f60973a0b608489ab013d3f40dc10ae1.tar.bz2 luajit-b03cebe1f60973a0b608489ab013d3f40dc10ae1.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lib_package.c | 3 | ||||
| -rw-r--r-- | src/lj_clib.c | 3 | ||||
| -rw-r--r-- | src/ljamalg.c | 2 | ||||
| -rw-r--r-- | src/luaconf.h | 3 |
4 files changed, 4 insertions, 7 deletions
diff --git a/src/lib_package.c b/src/lib_package.c index 9cb3f6b8..e8fc0ef7 100644 --- a/src/lib_package.c +++ b/src/lib_package.c | |||
| @@ -68,9 +68,6 @@ static const char *ll_bcsym(void *lib, const char *sym) | |||
| 68 | #elif LJ_TARGET_WINDOWS | 68 | #elif LJ_TARGET_WINDOWS |
| 69 | 69 | ||
| 70 | #define WIN32_LEAN_AND_MEAN | 70 | #define WIN32_LEAN_AND_MEAN |
| 71 | #ifndef WINVER | ||
| 72 | #define WINVER 0x0500 | ||
| 73 | #endif | ||
| 74 | #include <windows.h> | 71 | #include <windows.h> |
| 75 | 72 | ||
| 76 | #ifndef GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | 73 | #ifndef GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
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 |
diff --git a/src/ljamalg.c b/src/ljamalg.c index 6a4d6022..14473b80 100644 --- a/src/ljamalg.c +++ b/src/ljamalg.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #endif | 22 | #endif |
| 23 | 23 | ||
| 24 | #ifndef WINVER | 24 | #ifndef WINVER |
| 25 | #define WINVER 0x0500 | 25 | #define WINVER 0x0501 |
| 26 | #endif | 26 | #endif |
| 27 | 27 | ||
| 28 | #include "lua.h" | 28 | #include "lua.h" |
diff --git a/src/luaconf.h b/src/luaconf.h index d5f2d0f5..b297b315 100644 --- a/src/luaconf.h +++ b/src/luaconf.h | |||
| @@ -6,6 +6,9 @@ | |||
| 6 | #ifndef luaconf_h | 6 | #ifndef luaconf_h |
| 7 | #define luaconf_h | 7 | #define luaconf_h |
| 8 | 8 | ||
| 9 | #ifndef WINVER | ||
| 10 | #define WINVER 0x0501 | ||
| 11 | #endif | ||
| 9 | #include <limits.h> | 12 | #include <limits.h> |
| 10 | #include <stddef.h> | 13 | #include <stddef.h> |
| 11 | 14 | ||