diff options
| author | Jan D | 2015-05-17 16:46:34 +0200 |
|---|---|---|
| committer | Jan D | 2015-05-17 16:46:34 +0200 |
| commit | 6445ee0fb751ae2c1dfef900d44721b3d952812f (patch) | |
| tree | d43006cb93d9ea7b00ea02aabcd5577c41ff827f /src/process.c | |
| parent | f92ac2e82ed199d6f25d2a59508e08addb1150ac (diff) | |
| parent | c9c4708ed47b18987940a71b98eb9873150d2b95 (diff) | |
| download | emacs-6445ee0fb751ae2c1dfef900d44721b3d952812f.tar.gz emacs-6445ee0fb751ae2c1dfef900d44721b3d952812f.zip | |
Merge branch 'master' into cairo
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/process.c b/src/process.c index 3e04cb76387..ce78d818e29 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -136,8 +136,8 @@ extern int sys_select (int, fd_set *, fd_set *, fd_set *, | |||
| 136 | 136 | ||
| 137 | /* Work around GCC 4.7.0 bug with strict overflow checking; see | 137 | /* Work around GCC 4.7.0 bug with strict overflow checking; see |
| 138 | <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52904>. | 138 | <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52904>. |
| 139 | These lines can be removed once the GCC bug is fixed. */ | 139 | This bug appears to be fixed in GCC 5.1, so don't work around it there. */ |
| 140 | #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) | 140 | #if __GNUC__ == 4 && __GNUC_MINOR__ >= 3 |
| 141 | # pragma GCC diagnostic ignored "-Wstrict-overflow" | 141 | # pragma GCC diagnostic ignored "-Wstrict-overflow" |
| 142 | #endif | 142 | #endif |
| 143 | 143 | ||