summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch')
-rw-r--r--meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch65
1 files changed, 65 insertions, 0 deletions
diff --git a/meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch b/meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch
new file mode 100644
index 0000000..3f65dce
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/guile_2.0.9_fix_noreturn.patch
@@ -0,0 +1,65 @@
1From 36c40440078c005cd5e239cca487d29f6f60007d Mon Sep 17 00:00:00 2001
2From: Mark H Weaver <mhw@netris.org>
3Date: Mon, 4 Nov 2013 19:41:52 -0500
4Subject: [PATCH] Don't use the identifier 'noreturn'.
5
6Fixes <http://bugs.gnu.org/15798>.
7Reported by Matt Sicker <boards@gmail.com>.
8
9* libguile/__scm.h (SCM_NORETURN): Use ((__noreturn__)) instead of
10 ((noreturn)).
11
12* libguile/throw.h (scm_ithrow): Rename formal parameter from 'noreturn'
13 to 'no_return'.
14
15* libguile/throw.c (scm_ithrow): Rename formal parameter from 'noreturn'
16 to 'no_return'.
17---
18 libguile/__scm.h | 2 +-
19 libguile/throw.c | 2 +-
20 libguile/throw.h | 2 +-
21 3 files changed, 3 insertions(+), 3 deletions(-)
22
23Upstream-Status: Backport
24
25diff --git a/libguile/__scm.h b/libguile/__scm.h
26index ed35d53..a0b02b6 100644
27--- a/libguile/__scm.h
28+++ b/libguile/__scm.h
29@@ -77,7 +77,7 @@
30 * 1) int foo (char arg) SCM_NORETURN;
31 */
32 #ifdef __GNUC__
33-#define SCM_NORETURN __attribute__ ((noreturn))
34+#define SCM_NORETURN __attribute__ ((__noreturn__))
35 #else
36 #define SCM_NORETURN
37 #endif
38diff --git a/libguile/throw.c b/libguile/throw.c
39index 9c29351..7fc9edf 100644
40--- a/libguile/throw.c
41+++ b/libguile/throw.c
42@@ -436,7 +436,7 @@ scm_handle_by_throw (void *handler_data SCM_UNUSED, SCM tag, SCM args)
43 }
44
45 SCM
46-scm_ithrow (SCM key, SCM args, int noreturn SCM_UNUSED)
47+scm_ithrow (SCM key, SCM args, int no_return SCM_UNUSED)
48 {
49 return scm_throw (key, args);
50 }
51diff --git a/libguile/throw.h b/libguile/throw.h
52index 6cf6790..62592d2 100644
53--- a/libguile/throw.h
54+++ b/libguile/throw.h
55@@ -79,7 +79,7 @@ SCM_API int scm_exit_status (SCM args);
56 SCM_API SCM scm_catch_with_pre_unwind_handler (SCM tag, SCM thunk, SCM handler, SCM lazy_handler);
57 SCM_API SCM scm_catch (SCM tag, SCM thunk, SCM handler);
58 SCM_API SCM scm_with_throw_handler (SCM tag, SCM thunk, SCM handler);
59-SCM_API SCM scm_ithrow (SCM key, SCM args, int noreturn);
60+SCM_API SCM scm_ithrow (SCM key, SCM args, int no_return);
61
62 SCM_API SCM scm_throw (SCM key, SCM args);
63 SCM_INTERNAL void scm_init_throw (void);
64--
651.7.2.5