SHA256
1
0
forked from pool/uim
uim/uim-fix-multiple_declaration.diff

32 lines
1.0 KiB
Diff
Raw Permalink Normal View History

---
sigscheme/libgcroots/gcroots.c | 2 ++
sigscheme/libgcroots/include/private/gc_priv.h | 4 ++++
2 files changed, 6 insertions(+)
--- sigscheme/libgcroots/gcroots.c
+++ sigscheme/libgcroots/gcroots.c 2020-08-18 12:34:48.712190602 +0000
@@ -16,7 +16,9 @@
#include "gcroots.h"
#include "private/gcroots_priv.h"
+#define DECLARE_JMP
#include "private/gc_priv.h"
+#undef DECLARE_JMP
#if ((defined(__MWERKS__) && !defined(POWERPC)) \
|| (!defined(USE_ASM_PUSH_REGS) && defined(M68K)) \
--- sigscheme/libgcroots/include/private/gc_priv.h
+++ sigscheme/libgcroots/include/private/gc_priv.h 2020-08-18 12:35:41.103258717 +0000
@@ -2026,7 +2026,11 @@ void GC_err_puts(const char *s);
# if defined(NEED_FIND_LIMIT) || \
defined(USE_PROC_FOR_LIBRARIES) && defined(THREADS)
+# ifndef DECLARE_JMP
+extern JMP_BUF GC_jmp_buf;
+# else
JMP_BUF GC_jmp_buf;
+# endif
/* Set up a handler for address faults which will longjmp to */
/* GC_jmp_buf; */