Author: cazfi
Date: Fri Jan  9 20:11:11 2015
New Revision: 27593

URL: http://svn.gna.org/viewcvs/freeciv?rev=27593&view=rev
Log:
Updated included lua-5.3 to version 5.3.0-rc4

See patch #5683

Modified:
    branches/S2_6/dependencies/lua-5.3/README
    branches/S2_6/dependencies/lua-5.3/Version
    branches/S2_6/dependencies/lua-5.3/src/linit.c
    branches/S2_6/dependencies/lua-5.3/src/loadlib.c
    branches/S2_6/dependencies/lua-5.3/src/lobject.h
    branches/S2_6/dependencies/lua-5.3/src/lopcodes.c
    branches/S2_6/dependencies/lua-5.3/src/ltable.c

Modified: branches/S2_6/dependencies/lua-5.3/README
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/lua-5.3/README?rev=27593&r1=27592&r2=27593&view=diff
==============================================================================
--- branches/S2_6/dependencies/lua-5.3/README   (original)
+++ branches/S2_6/dependencies/lua-5.3/README   Fri Jan  9 20:11:11 2015
@@ -1,5 +1,5 @@
 
-This is Lua 5.3.0, released on 02 Jan 2015.
+This is Lua 5.3.0, released on 06 Jan 2015.
 
 For installation instructions, license details, and
 further information about Lua, see doc/readme.html.

Modified: branches/S2_6/dependencies/lua-5.3/Version
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/lua-5.3/Version?rev=27593&r1=27592&r2=27593&view=diff
==============================================================================
--- branches/S2_6/dependencies/lua-5.3/Version  (original)
+++ branches/S2_6/dependencies/lua-5.3/Version  Fri Jan  9 20:11:11 2015
@@ -1,4 +1,4 @@
-Sources here are from lua-5.3.0-rc3 
(http://www.lua.org/ftp/lua-5.3.0-rc3-tar.gz)
+Sources here are from lua-5.3.0-rc4 
(http://www.lua.org/ftp/lua-5.3.0-rc4-tar.gz)
 
 Not entire lua distribution directory hierarchy is included here, and
 some files needed for Freeciv usage have been added.

Modified: branches/S2_6/dependencies/lua-5.3/src/linit.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/lua-5.3/src/linit.c?rev=27593&r1=27592&r2=27593&view=diff
==============================================================================
--- branches/S2_6/dependencies/lua-5.3/src/linit.c      (original)
+++ branches/S2_6/dependencies/lua-5.3/src/linit.c      Fri Jan  9 20:11:11 2015
@@ -1,5 +1,5 @@
 /*
-** $Id: linit.c,v 1.37 2014/12/09 15:00:17 roberto Exp $
+** $Id: linit.c,v 1.38 2015/01/05 13:48:33 roberto Exp $
 ** Initialization of libraries for lua.c and other clients
 ** See Copyright Notice in lua.h
 */
@@ -7,9 +7,6 @@
 
 #define linit_c
 #define LUA_LIB
-
-#include "lprefix.h"
-
 
 /*
 ** If you embed Lua in your program and need to open the standard
@@ -26,6 +23,11 @@
 **  lua_setfield(L, -2, modname);
 **  lua_pop(L, 1);  // remove _PRELOAD table
 */
+
+#include "lprefix.h"
+
+
+#include <stddef.h>
 
 #include "lua.h"
 

Modified: branches/S2_6/dependencies/lua-5.3/src/loadlib.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/lua-5.3/src/loadlib.c?rev=27593&r1=27592&r2=27593&view=diff
==============================================================================
--- branches/S2_6/dependencies/lua-5.3/src/loadlib.c    (original)
+++ branches/S2_6/dependencies/lua-5.3/src/loadlib.c    Fri Jan  9 20:11:11 2015
@@ -1,5 +1,5 @@
 /*
-** $Id: loadlib.c,v 1.123 2014/11/12 13:31:51 roberto Exp $
+** $Id: loadlib.c,v 1.124 2015/01/05 13:51:39 roberto Exp $
 ** Dynamic library loader for Lua
 ** See Copyright Notice in lua.h
 **
@@ -135,6 +135,18 @@
 
 #include <dlfcn.h>
 
+/*
+** Macro to covert pointer to void* to pointer to function. This cast
+** is undefined according to ISO C, but POSIX assumes that it must work.
+** (The '__extension__' in gnu compilers is only to avoid warnings.)
+*/
+#if defined(__GNUC__)
+#define cast_func(p) (__extension__ (lua_CFunction)(p))
+#else
+#define cast_func(p) ((lua_CFunction)(p))
+#endif
+
+
 static void lsys_unloadlib (void *lib) {
   dlclose(lib);
 }
@@ -148,7 +160,7 @@
 
 
 static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
-  lua_CFunction f = (lua_CFunction)dlsym(lib, sym);
+  lua_CFunction f = cast_func(dlsym(lib, sym));
   if (f == NULL) lua_pushstring(L, dlerror());
   return f;
 }

Modified: branches/S2_6/dependencies/lua-5.3/src/lobject.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/lua-5.3/src/lobject.h?rev=27593&r1=27592&r2=27593&view=diff
==============================================================================
--- branches/S2_6/dependencies/lua-5.3/src/lobject.h    (original)
+++ branches/S2_6/dependencies/lua-5.3/src/lobject.h    Fri Jan  9 20:11:11 2015
@@ -1,5 +1,5 @@
 /*
-** $Id: lobject.h,v 2.105 2014/12/19 13:36:32 roberto Exp $
+** $Id: lobject.h,v 2.106 2015/01/05 13:52:37 roberto Exp $
 ** Type definitions for Lua objects
 ** See Copyright Notice in lua.h
 */
@@ -473,7 +473,7 @@
 
 
 /* copy a value into a key without messing up field 'next' */
-#define setkey(L,key,obj) \
+#define setnodekey(L,key,obj) \
        { TKey *k_=(key); const TValue *io_=(obj); \
          k_->nk.value_ = io_->value_; k_->nk.tt_ = io_->tt_; \
          (void)L; checkliveness(G(L),io_); }

Modified: branches/S2_6/dependencies/lua-5.3/src/lopcodes.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/lua-5.3/src/lopcodes.c?rev=27593&r1=27592&r2=27593&view=diff
==============================================================================
--- branches/S2_6/dependencies/lua-5.3/src/lopcodes.c   (original)
+++ branches/S2_6/dependencies/lua-5.3/src/lopcodes.c   Fri Jan  9 20:11:11 2015
@@ -1,5 +1,5 @@
 /*
-** $Id: lopcodes.c,v 1.54 2014/11/02 19:19:04 roberto Exp $
+** $Id: lopcodes.c,v 1.55 2015/01/05 13:48:33 roberto Exp $
 ** Opcodes for Lua virtual machine
 ** See Copyright Notice in lua.h
 */
@@ -9,6 +9,8 @@
 
 #include "lprefix.h"
 
+
+#include <stddef.h>
 
 #include "lopcodes.h"
 

Modified: branches/S2_6/dependencies/lua-5.3/src/ltable.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/lua-5.3/src/ltable.c?rev=27593&r1=27592&r2=27593&view=diff
==============================================================================
--- branches/S2_6/dependencies/lua-5.3/src/ltable.c     (original)
+++ branches/S2_6/dependencies/lua-5.3/src/ltable.c     Fri Jan  9 20:11:11 2015
@@ -1,5 +1,5 @@
 /*
-** $Id: ltable.c,v 2.99 2014/11/02 19:19:04 roberto Exp $
+** $Id: ltable.c,v 2.100 2015/01/05 13:52:37 roberto Exp $
 ** Lua tables (hash)
 ** See Copyright Notice in lua.h
 */
@@ -484,7 +484,7 @@
       mp = f;
     }
   }
-  setkey(L, &mp->i_key, key);
+  setnodekey(L, &mp->i_key, key);
   luaC_barrierback(L, t, key);
   lua_assert(ttisnil(gval(mp)));
   return gval(mp);


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to