[Emacs-diffs] trunk r112900: Merge from gnulib.

[Paul Eggert]

------------------------------------------------------------
revno: 112900
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2013-06-09 08:59:30 -0700
message:
  Merge from gnulib.
  
  This incorporates:
  2013-06-02 sig2str: port to C++
  2013-05-29 c-ctype, regex, verify: port to gcc -std=c90 -pedantic

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-06-08 18:13:24 +0000
+++ b/ChangeLog 2013-06-09 15:59:30 +0000
@@ -1,3 +1,9 @@
+2013-06-09  Paul Eggert  <address@hidden>
+
+       Merge from gnulib, incorporating:
+       2013-06-02 sig2str: port to C++
+       2013-05-29 c-ctype, regex, verify: port to gcc -std=c90 -pedantic
+
 2013-06-08  Jan Djärv  <address@hidden>
 
        * configure.ac (HAVE_GLIB): Only set XGSELOBJ if HAVE_NS = no.

=== modified file 'lib/c-ctype.h'
--- a/lib/c-ctype.h     2013-01-01 09:11:05 +0000
+++ b/lib/c-ctype.h     2013-06-09 15:59:30 +0000
@@ -136,7 +136,8 @@
 extern int c_toupper (int c) _GL_ATTRIBUTE_CONST;
 
 
-#if defined __GNUC__ && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ && 
!defined NO_C_CTYPE_MACROS
+#if (defined __GNUC__ && !defined __STRICT_ANSI__ && defined __OPTIMIZE__ \
+     && !defined __OPTIMIZE_SIZE__ && !defined NO_C_CTYPE_MACROS)
 
 /* ASCII optimizations. */
 

=== modified file 'lib/sig2str.h'
--- a/lib/sig2str.h     2013-01-02 16:37:04 +0000
+++ b/lib/sig2str.h     2013-06-09 15:59:30 +0000
@@ -27,9 +27,17 @@
 /* Size of a buffer needed to hold a signal name like "HUP".  */
 # define SIG2STR_MAX (sizeof "SIGRTMAX" + INT_STRLEN_BOUND (int) - 1)
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int sig2str (int, char *);
 int str2sig (char const *, int *);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 /* An upper bound on signal numbers allowed by the system.  */

=== modified file 'lib/verify.h'
--- a/lib/verify.h      2013-01-01 09:11:05 +0000
+++ b/lib/verify.h      2013-06-09 15:59:30 +0000
@@ -31,7 +31,9 @@
    Use this only with GCC.  If we were willing to slow 'configure'
    down we could also use it with other compilers, but since this
    affects only the quality of diagnostics, why bother?  */
-# if (4 < __GNUC__ || (__GNUC__ == 4 && 6 <= __GNUC_MINOR__)) && !defined 
__cplusplus
+# if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \
+      && (201112L <= __STDC_VERSION__  || !defined __STRICT_ANSI__) \
+      && !defined __cplusplus)
 #  define _GL_HAVE__STATIC_ASSERT 1
 # endif
 /* The condition (99 < __GNUC__) is temporary, until we know about the