configure: detect lua integer size

Lua 5.1 and 5.3 use a different integer size. Run a test program
to set the integer size used in the Rust FFI layer to Rust.

diff --git a/configure.ac b/configure.ac
index 56f01a24a317b87cf43cb46465226d06a2e35379..14a87563ddc322e4f8fdb19903ca52d7b361b2bd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2117,6 +2117,25 @@
 
     AM_CONDITIONAL([HAVE_LUA], [test "x$enable_lua" != "xno"])
 
+    # If Lua is enabled, test the integer size.
+    if test "x$enable_lua" = "xyes"; then
+        AC_MSG_CHECKING([size of lua integer])
+        AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include <lua.h> ]],
+            [[
+            if (sizeof(lua_Integer) == 8) {
+                exit(1);
+            }
+            exit(0);
+            ]])],
+            [
+                AC_MSG_RESULT([4])
+            ],
+            [
+                AC_MSG_RESULT([8])
+                AC_SUBST([LUA_INT8], ["lua_int8"])
+            ])
+    fi
+
   # libmaxminddb
     AC_ARG_ENABLE(geoip,
                AS_HELP_STRING([--enable-geoip],[Enable GeoIP2 support]),

diff --git a/rust/Cargo.toml.in b/rust/Cargo.toml.in
index 75a77bf71ba7602764bc02cb96b5fb3fda1cdc10..02776af38472226e80c46613ef72d41a6db50478 100644 (file)
--- a/rust/Cargo.toml.in
+++ b/rust/Cargo.toml.in
@@ -11,6 +11,7 @@ debug = true
 
 [features]
 lua = []
+lua_int8 = ["lua"]
 strict = []
 debug = []
 

diff --git a/rust/Makefile.am b/rust/Makefile.am
index 05a9655182d91a1056a9f6cd1735af0b4574a7f7..c7482fcb851c5b8f3662085c45d91d6cfab0eb22 100644 (file)
--- a/rust/Makefile.am
+++ b/rust/Makefile.am
@@ -20,7 +20,7 @@ RELEASE = --release
 endif
 
 if HAVE_LUA
-RUST_FEATURES +=       lua
+RUST_FEATURES +=       lua $(LUA_INT8)
 endif
 
 if DEBUG

diff --git a/rust/src/lua.rs b/rust/src/lua.rs
index 75e636ccaef27d1331249acc090753fd5cf9357b..87cb8b3acf9cdf2b30965173d1a36f7395f7e08f 100644 (file)
--- a/rust/src/lua.rs
+++ b/rust/src/lua.rs
@@ -19,6 +19,12 @@ use std::os::raw::c_char;
 use std::os::raw::c_int;
 use std::os::raw::c_long;
 
+#[cfg(feature = "lua_int8")]
+type LuaInteger = i64;
+
+#[cfg(not(feature = "lua_int8"))]
+type LuaInteger = i32;
+
 /// The Rust place holder for lua_State.
 pub enum CLuaState {}
 
@@ -26,7 +32,7 @@ extern {
     fn lua_createtable(lua: *mut CLuaState, narr: c_int, nrec: c_int);
     fn lua_settable(lua: *mut CLuaState, idx: c_long);
     fn lua_pushlstring(lua: *mut CLuaState, s: *const c_char, len: usize);
-    fn lua_pushinteger(lua: *mut CLuaState, n: c_long);
+    fn lua_pushinteger(lua: *mut CLuaState, n: LuaInteger);
 }
 
 pub struct LuaState {
@@ -55,7 +61,7 @@ impl LuaState {
 
     pub fn pushinteger(&self, val: i64) {
         unsafe {
-            lua_pushinteger(self.lua, val as c_long);
+            lua_pushinteger(self.lua, val as LuaInteger);
         }
     }
 }