From: Glenn Morris <rgm@gnu.org>
Date: Mon, 12 Jun 2017 21:43:28 +0000 (-0400)
Subject: Small portability fix for emacs-module.h (bug#27346)
X-Git-Tag: emacs-26.0.90~521^2~94
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=69899d4a7e6e9e1b5e9f1894c53a81e340907f9d;p=emacs.git

Small portability fix for emacs-module.h (bug#27346)

* src/emacs-module.h (EMACS_ATTRIBUTE_NONNULL) [!__has_attribute]:
Avoid 'error: missing binary operator before token "("'.
---

diff --git a/src/emacs-module.h b/src/emacs-module.h
index 88cc38191b1..313dd58d690 100644
--- a/src/emacs-module.h
+++ b/src/emacs-module.h
@@ -35,9 +35,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 # define EMACS_NOEXCEPT
 #endif
 
-#if defined __has_attribute && __has_attribute(__nonnull__)
+#ifdef __has_attribute
+#if __has_attribute(__nonnull__)
 # define EMACS_ATTRIBUTE_NONNULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
-#else
+#endif
+#endif
+#ifndef EMACS_ATTRIBUTE_NONNULL
 # define EMACS_ATTRIBUTE_NONNULL(...)
 #endif