From ceaca7bec6adf5735d51c1ca7efea5a2e05f470e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 23 Nov 2015 18:35:43 -0800 Subject: [PATCH] Simplify use of emacs_finalizer_function type * src/emacs-module.h (emacs_finalizer_function): Now EMACS_NOEXCEPT. All users simplified to omit EMACS_NOEXCEPT. (struct emacs_env_25): Use emacs_finalizer_function where applicable. --- src/emacs-module.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/emacs-module.h b/src/emacs-module.h index 06fc4c07020..ea5de76e950 100644 --- a/src/emacs-module.h +++ b/src/emacs-module.h @@ -64,7 +64,7 @@ typedef emacs_value (*emacs_subr) (emacs_env *env, ptrdiff_t nargs, emacs_value args[], void *data); /* Function prototype for module user-pointer finalizers. */ -typedef void (*emacs_finalizer_function) (void *); +typedef void (*emacs_finalizer_function) (void *) EMACS_NOEXCEPT; /* Possible Emacs function call outcomes. */ enum emacs_funcall_exit @@ -175,17 +175,17 @@ struct emacs_env_25 /* Embedded pointer type. */ emacs_value (*make_user_ptr) (emacs_env *env, - void (*fin) (void *) EMACS_NOEXCEPT, + emacs_finalizer_function fin, void *ptr); void *(*get_user_ptr) (emacs_env *env, emacs_value uptr); void (*set_user_ptr) (emacs_env *env, emacs_value uptr, void *ptr); - void (*(*get_user_finalizer) (emacs_env *env, emacs_value uptr)) - (void *) EMACS_NOEXCEPT; + emacs_finalizer_function (*get_user_finalizer) (emacs_env *env, + emacs_value uptr); void (*set_user_finalizer) (emacs_env *env, emacs_value uptr, - void (*fin) (void *) EMACS_NOEXCEPT); + emacs_finalizer_function fin); /* Vector functions. */ emacs_value (*vec_get) (emacs_env *env, emacs_value vec, ptrdiff_t i); -- 2.39.5