[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113249: Merge from gnulib.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r113249: Merge from gnulib. |
Date: |
Mon, 01 Jul 2013 23:43:23 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113249
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2013-07-01 16:43:19 -0700
message:
Merge from gnulib.
This incorporates:
2013-06-23 ignore-value: port to gcc -pedantic
2013-06-21 extern-inline: port to gcc -std=c89
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
lib/ignore-value.h ignorevalue.h-20110203213725-87ii79ljgr9ngwp2-1
m4/extern-inline.m4
externinline.m4-20120802044541-is9k4clv7vxbxmzw-4
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-06-30 15:24:14 +0000
+++ b/ChangeLog 2013-07-01 23:43:19 +0000
@@ -1,5 +1,9 @@
2013-06-30 Paul Eggert <address@hidden>
+ Merge from gnulib, incorporating:
+ 2013-06-23 ignore-value: port to gcc -pedantic
+ 2013-06-21 extern-inline: port to gcc -std=c89
+
Do not use GTK 3 if it exists but cannot be compiled.
* configure.ac: Leave GTK_OBJ and term_header alone if GTK 3
exists but cannot be compiled.
=== modified file 'lib/ignore-value.h'
--- a/lib/ignore-value.h 2013-01-01 09:11:05 +0000
+++ b/lib/ignore-value.h 2013-07-01 23:43:19 +0000
@@ -33,15 +33,16 @@
declared with attribute warn_unused_result". */
#ifndef _GL_IGNORE_VALUE_H
-# define _GL_IGNORE_VALUE_H
+#define _GL_IGNORE_VALUE_H
/* The __attribute__((__warn_unused_result__)) feature
is available in gcc versions 3.4 and newer,
while the typeof feature has been available since 2.7 at least. */
-# if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
-# define ignore_value(x) ((void) (x))
-# else
-# define ignore_value(x) (({ __typeof__ (x) __x = (x); (void) __x; }))
-# endif
+#if 3 < __GNUC__ + (4 <= __GNUC_MINOR__)
+# define ignore_value(x) \
+ (__extension__ ({ __typeof__ (x) __x = (x); (void) __x; }))
+#else
+# define ignore_value(x) ((void) (x))
+#endif
#endif
=== modified file 'm4/extern-inline.m4'
--- a/m4/extern-inline.m4 2013-06-18 21:31:00 +0000
+++ b/m4/extern-inline.m4 2013-07-01 23:43:19 +0000
@@ -31,7 +31,8 @@
&& !defined __APPLE__)
# define _GL_INLINE inline
# define _GL_EXTERN_INLINE extern inline
-#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__
+#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
+ && !defined __APPLE__)
# if __GNUC_GNU_INLINE__
/* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */
# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113249: Merge from gnulib.,
Paul Eggert <=