From: Philipp Stephani <phst@google.com>
Date: Mon, 5 Jun 2017 08:19:59 +0000 (+0200)
Subject: Inline module_has_cleanup
X-Git-Tag: emacs-26.0.90~521^2~170^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=13e9493ea36df04e2c6b69e9b316d40c072ee88b;p=emacs.git

Inline module_has_cleanup

This constant is only used once, and we fail compilation anyway if
it's false.

* src/emacs-module.c (MODULE_SETJMP_1): Inline __has_attribute.
---

diff --git a/src/emacs-module.c b/src/emacs-module.c
index 8ddf157b39f..71e04d869e9 100644
--- a/src/emacs-module.c
+++ b/src/emacs-module.c
@@ -37,12 +37,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Feature tests.  */
 
-#if __has_attribute (cleanup)
-enum { module_has_cleanup = true };
-#else
-enum { module_has_cleanup = false };
-#endif
-
 #ifdef WINDOWSNT
 #include <windows.h>
 #include "w32term.h"
@@ -168,7 +162,7 @@ static emacs_value const module_nil = 0;
       module_out_of_memory (env);					\
       return retval;							\
     }									\
-  verify (module_has_cleanup);						\
+  verify (__has_attribute (cleanup));                                   \
   struct handler *c __attribute__ ((cleanup (module_reset_handlerlist))) \
     = c0;								\
   if (sys_setjmp (c->jmp))						\