[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109724: Merge from gnulib.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109724: Merge from gnulib. |
Date: |
Tue, 21 Aug 2012 07:37:56 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109724
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2012-08-21 07:37:56 -0700
message:
Merge from gnulib.
modified:
ChangeLog
m4/extern-inline.m4
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-08-20 22:12:35 +0000
+++ b/ChangeLog 2012-08-21 14:37:56 +0000
@@ -1,3 +1,8 @@
+2012-08-21 Paul Eggert <address@hidden>
+
+ Merge from gnulib, incorporating:
+ 2012-08-20 extern-inline: support old GCC 'inline'
+
2012-08-20 Glenn Morris <address@hidden>
* configure.ac (AC_PROG_LN_S): Test for ln.
=== modified file 'm4/extern-inline.m4'
--- a/m4/extern-inline.m4 2012-08-14 03:15:52 +0000
+++ b/m4/extern-inline.m4 2012-08-21 14:37:56 +0000
@@ -21,20 +21,34 @@
#if __GNUC__ ? __GNUC_STDC_INLINE__ : 199901L <= __STDC_VERSION__
# define _GL_INLINE inline
# define _GL_EXTERN_INLINE extern inline
-# if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
-# define _GL_INLINE_HEADER_BEGIN \
- _Pragma ("GCC diagnostic push") \
- _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
- _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"")
-# define _GL_INLINE_HEADER_END \
- _Pragma ("GCC diagnostic pop")
+#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
+# if __GNUC_GNU_INLINE__
+ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */
+# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
+# else
+# define _GL_INLINE extern inline
# endif
+# define _GL_EXTERN_INLINE extern
#else
# define _GL_INLINE static inline
# define _GL_EXTERN_INLINE static inline
#endif
-#ifndef _GL_INLINE_HEADER_BEGIN
+#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
+# if __GNUC_STDC_INLINE__
+# define _GL_INLINE_HEADER_CONST_PRAGMA
+# else
+# define _GL_INLINE_HEADER_CONST_PRAGMA \
+ _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
+# endif
+# define _GL_INLINE_HEADER_BEGIN \
+ _Pragma ("GCC diagnostic push") \
+ _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
+ _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \
+ _GL_INLINE_HEADER_CONST_PRAGMA
+# define _GL_INLINE_HEADER_END \
+ _Pragma ("GCC diagnostic pop")
+#else
# define _GL_INLINE_HEADER_BEGIN
# define _GL_INLINE_HEADER_END
#endif])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109724: Merge from gnulib.,
Paul Eggert <=