From: Philipp Stephani <phst@google.com>
Date: Sat, 4 Jan 2020 02:21:32 +0000 (+0100)
Subject: emacs-module.h: Don't generate invalid C++11 code.
X-Git-Tag: emacs-28.0.90~7908^2~181
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=52db14b0dc5a93d7a7219917b8f603b14f94f24f;p=emacs.git

emacs-module.h: Don't generate invalid C++11 code.

* src/emacs-module.h.in: Remove 'noexcept' from function pointer type
aliases.  It is illegal there in C++11, see
https://en.cppreference.com/w/cpp/language/noexcept_spec.
---

diff --git a/src/emacs-module.h.in b/src/emacs-module.h.in
index b5ddd7d5fd8..e1bb00a3df6 100644
--- a/src/emacs-module.h.in
+++ b/src/emacs-module.h.in
@@ -88,11 +88,11 @@ struct emacs_runtime
 typedef emacs_value (*emacs_function) (emacs_env *env, ptrdiff_t nargs,
                                        emacs_value *args,
                                        void *data)
-  EMACS_NOEXCEPT EMACS_ATTRIBUTE_NONNULL (1);
+  EMACS_ATTRIBUTE_NONNULL (1);
 
 /* Function prototype for module user-pointer and function finalizers.
    These must not throw C++ exceptions.  */
-typedef void (*emacs_finalizer) (void *data) EMACS_NOEXCEPT;
+typedef void (*emacs_finalizer) (void *data);
 
 /* Possible Emacs function call outcomes.  */
 enum emacs_funcall_exit