commit fd396a6: [Fix] Do not use GC64 workaround on 32bit platforms, omg

Vsevolod Stakhov vsevolod at highsecure.ru
Thu Sep 17 22:35:09 UTC 2020


Author: Vsevolod Stakhov
Date: 2020-09-17 23:30:34 +0100
URL: https://github.com/rspamd/rspamd/commit/fd396a6293be7997767b1e97662693abf39c5a1a (HEAD -> master)

[Fix] Do not use GC64 workaround on 32bit platforms, omg
Issue: #3459

---
 contrib/lua-lpeg/lptypes.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contrib/lua-lpeg/lptypes.h b/contrib/lua-lpeg/lptypes.h
index e69a9ed6b..5748c8560 100644
--- a/contrib/lua-lpeg/lptypes.h
+++ b/contrib/lua-lpeg/lptypes.h
@@ -17,6 +17,7 @@
 
 #include <assert.h>
 #include <limits.h>
+#include <stdint.h>
 
 #include "lua.h"
 
@@ -151,8 +152,9 @@ typedef struct Charset {
 
 #define testchar(st,c)	(((int)(st)[((c) >> 3)] & (1 << ((c) & 7))))
 
-/* Special workaround for luajit */
-#if defined(WITH_LUAJIT) && !(defined(_X86_) || defined(__x86_64__) || defined(__i386__) || defined(__powerpc__))
+/* Special workaround for luajit lightuserdata limitations with GC64 */
+#if defined(WITH_LUAJIT) && INTPTR_MAX == INT64_MAX && \
+	!(defined(_X86_) || defined(__x86_64__) || defined(__i386__) || defined(__powerpc__))
 # define LPEG_LUD_WORKAROUND 1
 void * lpeg_allocate_mem_low(size_t sz);
 void lpeg_free_mem_low(void *p);


More information about the Commits mailing list