diff options
Diffstat (limited to 'src')
| -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 @@ | |||
| 1 | 2013-07-23 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * emacsgtkfixed.c: Port to GCC 4.6. | ||
| 4 | GCC 4.6 complains about -Wunused-local-typedefs, introduced in 4.7. | ||
| 5 | |||
| 1 | 2013-07-23 Juanma Barranquero <lekktu@gmail.com> | 6 | 2013-07-23 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 7 | ||
| 3 | * callproc.c (child_setup)[!WINDOWSNT]: Move exec_errno and pid | 8 | * 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/>. */ | |||
| 28 | #include "xterm.h" | 28 | #include "xterm.h" |
| 29 | 29 | ||
| 30 | /* Silence a bogus diagnostic; see GNOME bug 683906. */ | 30 | /* Silence a bogus diagnostic; see GNOME bug 683906. */ |
| 31 | #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) | 31 | #if 4 < __GNUC__ + (7 <= __GNUC_MINOR__) |
| 32 | # pragma GCC diagnostic push | 32 | # pragma GCC diagnostic push |
| 33 | # pragma GCC diagnostic ignored "-Wunused-local-typedefs" | 33 | # pragma GCC diagnostic ignored "-Wunused-local-typedefs" |
| 34 | #endif | 34 | #endif |