diff options
| author | Lua Team <team@lua.org> | 2008-01-20 12:00:00 +0000 |
|---|---|---|
| committer | repogen <> | 2008-01-20 12:00:00 +0000 |
| commit | 9ea694597c18612146b3423c9b343d15a4e57682 (patch) | |
| tree | cade3562e7e99661b3f68ee6782f1198221d2174 /src | |
| parent | 6e5d828a4035d80ba8e3e6f827094bf28919357b (diff) | |
| download | lua-github-9ea694597c18612146b3423c9b343d15a4e57682.tar.gz | |
Lua 5.1.3-rc45.1.3-rc4
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 6 | ||||
| -rw-r--r-- | src/lbaselib.c | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/Makefile b/src/Makefile index 748d0f8d..e4a3cd61 100644 --- a/src/Makefile +++ b/src/Makefile @@ -99,9 +99,9 @@ linux: $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" macosx: - $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX -# use this on Mac OS X 10.4 -# $(MAKE) all MYCFLAGS="-DLUA_USE_MACOSX -DLUA_USE_READLINE" MYLIBS="-lreadline" + $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline" +# use this on Mac OS X 10.3- +# $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX mingw: $(MAKE) "LUA_A=lua51.dll" "LUA_T=lua.exe" \ diff --git a/src/lbaselib.c b/src/lbaselib.c index cdeb15ca..eb06bcef 100644 --- a/src/lbaselib.c +++ b/src/lbaselib.c @@ -1,5 +1,5 @@ /* -** $Id: lbaselib.c,v 1.191.1.3 2008/01/03 15:20:39 roberto Exp $ +** $Id: lbaselib.c,v 1.191.1.4 2008/01/20 13:53:22 roberto Exp $ ** Basic library ** See Copyright Notice in lua.h */ @@ -595,9 +595,8 @@ static int luaB_yield (lua_State *L) { static int luaB_corunning (lua_State *L) { if (lua_pushthread(L)) - return 0; /* main thread is not a coroutine */ - else - return 1; + lua_pushnil(L); /* main thread is not a coroutine */ + return 1; } |