diff options
| author | Paul Eggert | 2013-11-06 11:36:12 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-11-06 11:36:12 -0800 |
| commit | a5d376b02ec9838cb0651ddc2f61025d196a77e5 (patch) | |
| tree | c098d827afaf9635675429eb7a76629a084b3ae0 /src | |
| parent | 2ec9db5d1e97275a2a4c27e04ed6f3e8c3382cab (diff) | |
| download | emacs-a5d376b02ec9838cb0651ddc2f61025d196a77e5.tar.gz emacs-a5d376b02ec9838cb0651ddc2f61025d196a77e5.zip | |
* regex.c: Fix --enable-gcc-warning glitch with GCC 4.5.2.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/regex.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 07e27ac820c..37118e9bd6c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-11-06 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * regex.c: Fix --enable-gcc-warning glitch with GCC 4.5.2. | ||
| 4 | |||
| 1 | 2013-11-06 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2013-11-06 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * xdisp.c (syms_of_xdisp): New vars redisplay--all-windows-cause and | 7 | * xdisp.c (syms_of_xdisp): New vars redisplay--all-windows-cause and |
diff --git a/src/regex.c b/src/regex.c index 4ab98bbf098..615fb3fdf34 100644 --- a/src/regex.c +++ b/src/regex.c | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | # endif | 43 | # endif |
| 44 | #endif | 44 | #endif |
| 45 | 45 | ||
| 46 | #if 4 < __GNUC__ + (5 <= __GNUC_MINOR__) && ! defined __clang__ | 46 | #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) && ! defined __clang__ |
| 47 | # pragma GCC diagnostic ignored "-Wunused-but-set-variable" | 47 | # pragma GCC diagnostic ignored "-Wunused-but-set-variable" |
| 48 | #endif | 48 | #endif |
| 49 | 49 | ||