Takashi Iwai
3319c9c0a4
- Add patch uim-fix-multiple_declaration.diff to avoid multiple declaration of GCROOTS_jmp_buf - Add patch bugzilla-1175274-emacs-27.1.patch There is no (process-kill-without-query) anymore, use (set-process-query-on-exit-flag) instead (boo#1175274). OBS-URL: https://build.opensuse.org/request/show/827590 OBS-URL: https://build.opensuse.org/package/show/M17N/uim?expand=0&rev=57
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
---
|
|
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; */
|