From 6e67d8ab78de3936c74bffcd689267f4ea0a6922 Mon Sep 17 00:00:00 2001 From: Xuxingliang Date: Thu, 22 Dec 2022 11:04:18 +0800 Subject: [PATCH] luamodules: fix compile warning in cjson Signed-off-by: Xuxingliang --- .../cjson/0001-fix-compile-warnings.patch | 55 +++++++++++++++++++ interpreters/luamodules/cjson/Makefile | 1 + 2 files changed, 56 insertions(+) create mode 100644 interpreters/luamodules/cjson/0001-fix-compile-warnings.patch diff --git a/interpreters/luamodules/cjson/0001-fix-compile-warnings.patch b/interpreters/luamodules/cjson/0001-fix-compile-warnings.patch new file mode 100644 index 000000000..fefcbdcd2 --- /dev/null +++ b/interpreters/luamodules/cjson/0001-fix-compile-warnings.patch @@ -0,0 +1,55 @@ +From 68d772a032f5cb12526ad6c7769c0b3a671fcfa9 Mon Sep 17 00:00:00 2001 +From: Xuxingliang +Date: Thu, 22 Dec 2022 11:01:01 +0800 +Subject: [PATCH] fix compile warnings + +Signed-off-by: Xuxingliang +--- + fpconv.c | 4 ++-- + fpconv.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/fpconv.c b/fpconv.c +index 3e480ec..0ef7f18 100644 +--- a/fpconv.c ++++ b/fpconv.c +@@ -55,7 +55,7 @@ static char locale_decimal_point = '.'; + * localconv() may not be thread safe (=>crash), and nl_langinfo() is + * not supported on some platforms. Use sprintf() instead - if the + * locale does change, at least Lua CJSON won't crash. */ +-static void fpconv_update_locale() ++static void fpconv_update_locale(void) + { + char buf[8]; + +@@ -202,7 +202,7 @@ int fpconv_g_fmt(char *str, double num, int precision) + return len; + } + +-void fpconv_init() ++void fpconv_init(void) + { + fpconv_update_locale(); + } +diff --git a/fpconv.h b/fpconv.h +index 7b0d0ee..59e0867 100644 +--- a/fpconv.h ++++ b/fpconv.h +@@ -7,12 +7,12 @@ + # define FPCONV_G_FMT_BUFSIZE 32 + + #ifdef USE_INTERNAL_FPCONV +-static inline void fpconv_init() ++static inline void fpconv_init(void) + { + /* Do nothing - not required */ + } + #else +-extern void fpconv_init(); ++extern void fpconv_init(void); + #endif + + extern int fpconv_g_fmt(char*, double, int); +-- +2.25.1 + diff --git a/interpreters/luamodules/cjson/Makefile b/interpreters/luamodules/cjson/Makefile index e9f1eb86a..c5a8fb800 100644 --- a/interpreters/luamodules/cjson/Makefile +++ b/interpreters/luamodules/cjson/Makefile @@ -38,6 +38,7 @@ $(LUACJSON_UNPACK): $(LUACJSON_TARBALL) $(Q) echo "Unpacking $(LUACJSON_TARBALL) to $(LUACJSON_UNPACK)" $(Q) tar -xvzf $(LUACJSON_TARBALL) $(Q) mv lua-cjson-$(LUACJSON_VERSION) $(LUACJSON_UNPACK) + $(Q) patch -d $(LUACJSON_UNPACK) -p1 < 0001-fix-compile-warnings.patch $(LUACJSON_UNPACK)/.patch: $(LUACJSON_UNPACK) touch $(LUACJSON_UNPACK)/.patch