emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 69899d4: Small portability fix for emacs-module.h (


From: Glenn Morris
Subject: [Emacs-diffs] master 69899d4: Small portability fix for emacs-module.h (bug#27346)
Date: Mon, 12 Jun 2017 17:43:41 -0400 (EDT)

branch: master
commit 69899d4a7e6e9e1b5e9f1894c53a81e340907f9d
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    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 "("'.
---
 src/emacs-module.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/emacs-module.h b/src/emacs-module.h
index 88cc381..313dd58 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
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]