daemon/lua/kres-gen.lua: make it self-contained

Now those type definitions can be simply loaded without any error, e.g.
luajit daemon/lua/kres-gen.lua
That will be useful for checking them without regenerating them.

diff --git a/daemon/lua/kres-gen.lua b/daemon/lua/kres-gen.lua
index 981d38fc0a481c20bc038493de59165f51255d72..e885c815d2fd0b2d581612829f3ebe7259d2dfa9 100644 (file)
--- a/daemon/lua/kres-gen.lua
+++ b/daemon/lua/kres-gen.lua
@@ -2,6 +2,13 @@
 
 local ffi = require('ffi')
 --[[ This file is generated by ./kres-gen.sh ]] ffi.cdef[[
+typedef long time_t;
+typedef long __time_t;
+typedef long __suseconds_t;
+struct timeval {
+       __time_t tv_sec;
+       __suseconds_t tv_usec;
+};
 
 typedef struct knot_dump_style knot_dump_style_t;
 extern const knot_dump_style_t KNOT_DUMP_STYLE_DEFAULT;

diff --git a/daemon/lua/kres-gen.sh b/daemon/lua/kres-gen.sh
index 9151fea2d1a8fb5d0d31bfc483b25dd2cbf783f2..1cb9bd115cf21d2eb7ba3d0d9efb6e9430f5dd5b 100755 (executable)
--- a/daemon/lua/kres-gen.sh
+++ b/daemon/lua/kres-gen.sh
@@ -51,6 +51,14 @@ printf -- "-- SPDX-License-Identifier: GPL-3.0-or-later\n\n"
 printf -- "local ffi = require('ffi')\n"
 printf -- "--[[ This file is generated by ./kres-gen.sh ]] ffi.cdef[[\n"
 
+# Some system dependencies.  TODO: this generated part isn't perfectly portable.
+${CDEFS} ${LIBKRES} types <<-EOF
+       typedef time_t
+       __time_t
+       __suseconds_t
+       struct timeval
+EOF
+
 ## Various types (mainly), from libknot and libkres
 
 printf "

diff --git a/daemon/lua/kres.lua b/daemon/lua/kres.lua
index 640d8427d734966ef19595711993fc60a09d7e64..3f6fa0c35c01e23c1d0df82eada6c1076f565a81 100644 (file)
--- a/daemon/lua/kres.lua
+++ b/daemon/lua/kres.lua
@@ -36,12 +36,6 @@ ffi.cdef[[
  * Data structures
  */
 
-/* stdlib */
-typedef long time_t;
-struct timeval {
-       time_t tv_sec;
-       time_t tv_usec;
-};
 struct sockaddr {
     uint16_t sa_family;
     uint8_t _stub[]; /* Do not touch */