aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--loadlib.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/loadlib.c b/loadlib.c
index ec3b842b..3087d264 100644
--- a/loadlib.c
+++ b/loadlib.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: loadlib.c,v 1.82 2010/03/19 15:02:34 roberto Exp roberto $ 2** $Id: loadlib.c,v 1.83 2010/05/31 16:34:19 roberto Exp roberto $
3** Dynamic library loader for Lua 3** Dynamic library loader for Lua
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5** 5**
@@ -145,7 +145,7 @@ static void setprogdir (lua_State *L) {
145 char buff[MAX_PATH + 1]; 145 char buff[MAX_PATH + 1];
146 char *lb; 146 char *lb;
147 DWORD nsize = sizeof(buff)/sizeof(char); 147 DWORD nsize = sizeof(buff)/sizeof(char);
148 DWORD n = GetModuleFileName(NULL, buff, nsize); 148 DWORD n = GetModuleFileNameA(NULL, buff, nsize);
149 if (n == 0 || n == nsize || (lb = strrchr(buff, '\\')) == NULL) 149 if (n == 0 || n == nsize || (lb = strrchr(buff, '\\')) == NULL)
150 luaL_error(L, "unable to get ModuleFileName"); 150 luaL_error(L, "unable to get ModuleFileName");
151 else { 151 else {
@@ -159,7 +159,7 @@ static void setprogdir (lua_State *L) {
159static void pusherror (lua_State *L) { 159static void pusherror (lua_State *L) {
160 int error = GetLastError(); 160 int error = GetLastError();
161 char buffer[128]; 161 char buffer[128];
162 if (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM, 162 if (FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
163 NULL, error, 0, buffer, sizeof(buffer), NULL)) 163 NULL, error, 0, buffer, sizeof(buffer), NULL))
164 lua_pushstring(L, buffer); 164 lua_pushstring(L, buffer);
165 else 165 else
@@ -172,7 +172,7 @@ static void ll_unloadlib (void *lib) {
172 172
173 173
174static void *ll_load (lua_State *L, const char *path, int seeglb) { 174static void *ll_load (lua_State *L, const char *path, int seeglb) {
175 HMODULE lib = LoadLibraryEx(path, NULL, LUA_LLE_FLAGS); 175 HMODULE lib = LoadLibraryExA(path, NULL, LUA_LLE_FLAGS);
176 (void)(seeglb); /* symbols are 'global' by default? */ 176 (void)(seeglb); /* symbols are 'global' by default? */
177 if (lib == NULL) pusherror(L); 177 if (lib == NULL) pusherror(L);
178 return lib; 178 return lib;