mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

Don't use the identifier 'noreturn'.

Browse source 
Fixes <http://bugs.gnu.org/15798>.
Reported by Matt Sicker <boards@gmail.com>.

* libguile/__scm.h (SCM_NORETURN): Use ((__noreturn__)) instead of
  ((noreturn)).

* libguile/throw.h (scm_ithrow): Rename formal parameter from 'noreturn'
  to 'no_return'.

* libguile/throw.c (scm_ithrow): Rename formal parameter from 'noreturn'
  to 'no_return'.
This commit is contained in:
Mark H Weaver 2013-11-04 19:41:52 -05:00
parent b1fe20c24c
commit 36c4044007
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libguile/__scm.h
View file

@ -77,7 +77,7 @@
* 1) int foo (char arg) SCM_NORETURN; * 1) int foo (char arg) SCM_NORETURN;
*/ */
#ifdef __GNUC__ #ifdef __GNUC__
#define SCM_NORETURN __attribute__ ((noreturn)) #define SCM_NORETURN __attribute__ ((__noreturn__))
#else #else
#define SCM_NORETURN #define SCM_NORETURN
#endif #endif

2
libguile/throw.c
View file

@ -436,7 +436,7 @@ scm_handle_by_throw (void *handler_data SCM_UNUSED, SCM tag, SCM args)
} }
SCM SCM
scm_ithrow (SCM key, SCM args, int noreturn SCM_UNUSED) scm_ithrow (SCM key, SCM args, int no_return SCM_UNUSED)
{ {
return scm_throw (key, args); return scm_throw (key, args);
} }

2
libguile/throw.h
View file

@ -79,7 +79,7 @@ SCM_API int scm_exit_status (SCM args);
SCM_API SCM scm_catch_with_pre_unwind_handler (SCM tag, SCM thunk, SCM handler, SCM lazy_handler); SCM_API SCM scm_catch_with_pre_unwind_handler (SCM tag, SCM thunk, SCM handler, SCM lazy_handler);
SCM_API SCM scm_catch (SCM tag, SCM thunk, SCM handler); SCM_API SCM scm_catch (SCM tag, SCM thunk, SCM handler);
SCM_API SCM scm_with_throw_handler (SCM tag, SCM thunk, SCM handler); SCM_API SCM scm_with_throw_handler (SCM tag, SCM thunk, SCM handler);
SCM_API SCM scm_ithrow (SCM key, SCM args, int noreturn); SCM_API SCM scm_ithrow (SCM key, SCM args, int no_return);
SCM_API SCM scm_throw (SCM key, SCM args); SCM_API SCM scm_throw (SCM key, SCM args);
SCM_INTERNAL void scm_init_throw (void); SCM_INTERNAL void scm_init_throw (void);