diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2012-08-22 13:30:25 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2012-08-22 13:30:25 +0200 |
| commit | fe72cdc5b294d61eddf2ed96072a64c50686a20c (patch) | |
| tree | 22aa2252faf868707313ccc76f0ed008f9d5b37f /nt | |
| parent | 3b7bf1d45b5ad46222cd64071af110c5ce3bb007 (diff) | |
| download | emacs-fe72cdc5b294d61eddf2ed96072a64c50686a20c.tar.gz | |
nt/config.nt: Sync with autogen/config.in.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/config.nt | 30 |
2 files changed, 26 insertions, 8 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 12273ec7853..7729f09d00f 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2012-08-22 Juanma Barranquero <lekktu@gmail.com> + + * config.nt: Sync with autogen/config.in. + 2012-08-17 Juanma Barranquero <lekktu@gmail.com> * config.nt: Sync with autogen/config.in. diff --git a/nt/config.nt b/nt/config.nt index 5181e09e64e..34495928b92 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -1563,20 +1563,34 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #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 |