diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-07-23 07:38:51 +0100 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-07-23 07:38:51 +0100 |
| commit | 9ca960e27a653f6dcaf057eefc5243bf4c223e72 (patch) | |
| tree | bc4de7b238db0350bdf96b00b2c53277f20e5ba3 | |
| parent | 02efb5eee680f8d1f4fa932106ed492c2fd7ff4b (diff) | |
| download | emacs-9ca960e27a653f6dcaf057eefc5243bf4c223e72.tar.gz | |
* emacsgtkfixed.c: Port to GCC 4.6.
GCC 4.6 complains about -Wunused-local-typedefs, introduced in 4.7.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/emacsgtkfixed.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1423b9d366e..97d9cc9f41d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-07-23 Paul Eggert <eggert@cs.ucla.edu> + + * emacsgtkfixed.c: Port to GCC 4.6. + GCC 4.6 complains about -Wunused-local-typedefs, introduced in 4.7. + 2013-07-23 Juanma Barranquero <lekktu@gmail.com> * callproc.c (child_setup)[!WINDOWSNT]: Move exec_errno and pid diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c index 970683da9c4..8b19d89f3a0 100644 --- a/src/emacsgtkfixed.c +++ b/src/emacsgtkfixed.c @@ -28,7 +28,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "xterm.h" /* Silence a bogus diagnostic; see GNOME bug 683906. */ -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) +#if 4 < __GNUC__ + (7 <= __GNUC_MINOR__) # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wunused-local-typedefs" #endif |