[liblouis-liblouisxml] [liblouis] r882 committed - Upgrade to newest gnulib

• From: liblouis@xxxxxxxxxxxxxx
• To: liblouis-liblouisxml@xxxxxxxxxxxxx
• Date: Wed, 19 Dec 2012 11:41:43 +0000

Revision: 882
Author:   christian.egli@xxxxxxxxxxxxxx
Date:     Wed Dec 19 03:40:39 2012
Log:      Upgrade to newest gnulib

http://code.google.com/p/liblouis/source/detail?r=882

Added:
 /trunk/gnulib/m4/extern-inline.m4
 /trunk/gnulib/unistd.c
Modified:
 /trunk/ChangeLog
 /trunk/build-aux/snippet/warn-on-use.h
 /trunk/gnulib/Makefile.am
 /trunk/gnulib/m4/gnulib-comp.m4
 /trunk/gnulib/m4/unistd_h.m4
 /trunk/gnulib/unistd.in.h

=======================================
--- /dev/null
+++ /trunk/gnulib/m4/extern-inline.m4   Wed Dec 19 03:40:39 2012
@@ -0,0 +1,62 @@
+dnl 'extern inline' a la ISO C99.
+
+dnl Copyright 2012 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_EXTERN_INLINE],
+[
+  AH_VERBATIM([extern_inline],
+[/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'.
+   _GL_EXTERN_INLINE is a portable alternative to 'extern inline'.
+   _GL_INLINE_HEADER_BEGIN contains useful stuff to put
+     in an include file, before uses of _GL_INLINE.

+ It suppresses GCC's bogus "no previous prototype for 'FOO'" diagnostic,

+     when FOO is an inline function in the header; see
+     <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.
+   _GL_INLINE_HEADER_END contains useful stuff to put
+     in the same include file, after uses of _GL_INLINE.
+
+   Suppress the use of extern inline on Apple's platforms,
+   as Libc-825.25 (2012-09-19) is incompatible with it; see
+   <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
+   Perhaps Apple will fix this some day.  */
+#if ((__GNUC__ \
+      ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
+      : 199901L <= __STDC_VERSION__) \
+     && !defined __APPLE__)
+# define _GL_INLINE inline
+# define _GL_EXTERN_INLINE extern inline
+#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__
+# 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 _GL_UNUSED
+# define _GL_EXTERN_INLINE static _GL_UNUSED
+#endif
+
+#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
+# if defined __GNUC_STDC_INLINE__ && __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])
+])
=======================================
--- /dev/null
+++ /trunk/gnulib/unistd.c      Wed Dec 19 03:40:39 2012
@@ -0,0 +1,3 @@
+#include <config.h>
+#define _GL_UNISTD_INLINE _GL_EXTERN_INLINE
+#include "unistd.h"
=======================================
--- /trunk/ChangeLog    Wed Dec 19 03:10:01 2012
+++ /trunk/ChangeLog    Wed Dec 19 03:40:39 2012
@@ -1,5 +1,13 @@
 2012-12-19  Christian Egli  <christian.egli@xxxxxx>

+       * gnulib/m4/unistd_h.m4:
+       * gnulib/m4/gnulib-comp.m4:
+       * gnulib/m4/extern-inline.m4:
+       * gnulib/unistd.in.h:
+       * gnulib/unistd.c:
+       * gnulib/Makefile.am (libgnu_la_SOURCES):
+       * build-aux/snippet/warn-on-use.h: Upgrade to newest gnulib
+
        * tests/brl_checks.c (convert_typeform): Make it compile under
        C89.

=======================================
--- /trunk/build-aux/snippet/warn-on-use.h      Tue Oct  2 08:16:35 2012
+++ /trunk/build-aux/snippet/warn-on-use.h      Wed Dec 19 03:40:39 2012
@@ -55,7 +55,7 @@
    rather than issue the nice warning, but the end result of informing
    the developer about their portability problem is still achieved):
    #if HAVE_RAW_DECL_ENVIRON
-   static inline char ***rpl_environ (void) { return &environ; }
+   static char ***rpl_environ (void) { return &environ; }

_GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");

    # undef environ
    # define environ (*rpl_environ ())
=======================================
--- /trunk/gnulib/Makefile.am   Tue Oct  2 07:53:59 2012
+++ /trunk/gnulib/Makefile.am   Wed Dec 19 03:40:39 2012
@@ -246,6 +246,7 @@
 ## begin gnulib module unistd

 BUILT_SOURCES += unistd.h
+libgnu_la_SOURCES += unistd.c

 # We need the following in order to create an empty placeholder for
 # <unistd.h> when the system doesn't have one.
=======================================
--- /trunk/gnulib/m4/gnulib-comp.m4     Tue Oct  2 07:53:59 2012
+++ /trunk/gnulib/m4/gnulib-comp.m4     Wed Dec 19 03:40:39 2012
@@ -40,6 +40,7 @@
   AC_REQUIRE([gl_PROG_AR_RANLIB])
   # Code from module extensions:
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  # Code from module extern-inline:
   # Code from module getopt-gnu:
   # Code from module getopt-posix:
   # Code from module gettext-h:
@@ -76,6 +77,7 @@
   m4_pushdef([gl_LIBSOURCES_DIR], [])
   gl_COMMON
   gl_source_base='gnulib'
+  AC_REQUIRE([gl_EXTERN_INLINE])
   gl_FUNC_GETOPT_GNU
   if test $REPLACE_GETOPT = 1; then
     AC_LIBOBJ([getopt])
@@ -255,11 +257,13 @@
   lib/stdarg.in.h
   lib/stddef.in.h
   lib/sys_types.in.h
+  lib/unistd.c
   lib/unistd.in.h
   lib/version-etc.c
   lib/version-etc.h
   m4/00gnulib.m4
   m4/extensions.m4
+  m4/extern-inline.m4
   m4/getopt.m4
   m4/gnulib-common.m4
   m4/include_next.m4
=======================================
--- /trunk/gnulib/m4/unistd_h.m4        Tue Oct  2 07:53:59 2012
+++ /trunk/gnulib/m4/unistd_h.m4        Wed Dec 19 03:40:39 2012
@@ -1,4 +1,4 @@
-# unistd_h.m4 serial 65
+# unistd_h.m4 serial 66
 dnl Copyright (C) 2006-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -11,7 +11,6 @@
   dnl Use AC_REQUIRE here, so that the default behavior below is expanded
   dnl once only, before all statements that occur in other macros.
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_REQUIRE([AC_C_INLINE])

   gl_CHECK_NEXT_HEADERS([unistd.h])
   if test $ac_cv_header_unistd_h = yes; then
=======================================
--- /trunk/gnulib/unistd.in.h   Tue Oct  2 07:53:59 2012
+++ /trunk/gnulib/unistd.in.h   Wed Dec 19 03:40:39 2012
@@ -127,6 +127,11 @@
 # include <getopt.h>
 #endif

+_GL_INLINE_HEADER_BEGIN
+#ifndef _GL_UNISTD_INLINE
+# define _GL_UNISTD_INLINE _GL_INLINE
+#endif
+
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */

 /* The definition of _GL_ARG_NONNULL is copied here.  */
@@ -404,7 +409,7 @@
 # endif
 #elif defined GNULIB_POSIXCHECK
 # if HAVE_RAW_DECL_ENVIRON
-static inline char ***
+_GL_UNISTD_INLINE char ***
 rpl_environ (void)
 {
   return &environ;
@@ -862,7 +867,7 @@
 #     define getpagesize() _gl_getpagesize ()
 #    else
 #     if !GNULIB_defined_getpagesize_function
-static inline int
+_GL_UNISTD_INLINE int
 getpagesize ()
 {
   return _gl_getpagesize ();
@@ -1530,6 +1535,7 @@
 _GL_CXXALIASWARN (write);
 #endif

+_GL_INLINE_HEADER_END

 #endif /* _@GUARD_PREFIX@_UNISTD_H */
 #endif /* _@GUARD_PREFIX@_UNISTD_H */
For a description of the software, to download it and links to
project pages go to http://www.abilitiessoft.com

Other related posts:

• » [liblouis-liblouisxml] [liblouis] r882 committed - Upgrade to newest gnulib - liblouis

1. Home
2. liblouis-liblouisxml
3. Archive
4. 12-2012

---

• » Previous by Date
• » Next by Date
• » Related Posts
• » View list details
• » Manage your subscription

---