aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2013-06-18 14:31:00 -0700
committerPaul Eggert2013-06-18 14:31:00 -0700
commitec9295aeaa0ca3616507b66bd6e2f81dce05e820 (patch)
treec9cf9566805ba3f6b679c549bafd35877acc09e0
parent292c880c7e219e5740726f8a28a77921b12d5965 (diff)
downloademacs-ec9295aeaa0ca3616507b66bd6e2f81dce05e820.tar.gz
emacs-ec9295aeaa0ca3616507b66bd6e2f81dce05e820.zip
Merge from gnulib (comment fixes only).
-rw-r--r--m4/extern-inline.m414
1 files changed, 5 insertions, 9 deletions
diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4
index 94b46dde07d..4e801e31f41 100644
--- a/m4/extern-inline.m4
+++ b/m4/extern-inline.m4
@@ -8,15 +8,7 @@ dnl with or without modifications, as long as this notice is preserved.
8AC_DEFUN([gl_EXTERN_INLINE], 8AC_DEFUN([gl_EXTERN_INLINE],
9[ 9[
10 AH_VERBATIM([extern_inline], 10 AH_VERBATIM([extern_inline],
11[/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'. 11[/* Please see the Gnulib manual for how to use these macros.
12 _GL_EXTERN_INLINE is a portable alternative to 'extern inline'.
13 _GL_INLINE_HEADER_BEGIN contains useful stuff to put
14 in an include file, before uses of _GL_INLINE.
15 It suppresses GCC's bogus "no previous prototype for 'FOO'" diagnostic,
16 when FOO is an inline function in the header; see
17 <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.
18 _GL_INLINE_HEADER_END contains useful stuff to put
19 in the same include file, after uses of _GL_INLINE.
20 12
21 Suppress extern inline with HP-UX cc, as it appears to be broken; see 13 Suppress extern inline with HP-UX cc, as it appears to be broken; see
22 <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>. 14 <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
@@ -59,6 +51,10 @@ AC_DEFUN([gl_EXTERN_INLINE],
59# define _GL_INLINE_HEADER_CONST_PRAGMA \ 51# define _GL_INLINE_HEADER_CONST_PRAGMA \
60 _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") 52 _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
61# endif 53# endif
54 /* Suppress GCC's bogus "no previous prototype for 'FOO'"
55 and "no previous declaration for 'FOO'" diagnostics,
56 when FOO is an inline function in the header; see
57 <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>. */
62# define _GL_INLINE_HEADER_BEGIN \ 58# define _GL_INLINE_HEADER_BEGIN \
63 _Pragma ("GCC diagnostic push") \ 59 _Pragma ("GCC diagnostic push") \
64 _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ 60 _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \