diff options
| author | Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2014-11-11 09:20:07 +0000 |
|---|---|---|
| committer | François-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2014-11-11 09:20:07 +0000 |
| commit | 33c430b50424ec31c83603616fc94671fc7ffac2 (patch) | |
| tree | 24bb32afacf6702b2c625a2a53eac39fadac1484 /gcc/system.h | |
| parent | 04dc44ac2176a137c38eff59138df59b230e6ee1 (diff) | |
| download | gcc-33c430b50424ec31c83603616fc94671fc7ffac2.zip gcc-33c430b50424ec31c83603616fc94671fc7ffac2.tar.gz gcc-33c430b50424ec31c83603616fc94671fc7ffac2.tar.bz2 | |
re PR bootstrap/63699 (Bootstrap fails in libcc1 on darwin14)
PR bootstrap/63699
PR bootstrap/63750
* system.h: Include <string> before "safe-ctype.h"
* wide-int.h (wi::smin, wi::smax, wi::umin, wi::umax): Prefix
calls to min/max with wi namespace.
* ipa-chkp.c: Don't include <string>.
* plugin.cc: Don't include <string>.
From-SVN: r217342
Diffstat (limited to 'gcc/system.h')
| -rw-r--r-- | gcc/system.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gcc/system.h b/gcc/system.h index 74ddfe9..c05f02d 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -194,6 +194,13 @@ extern int fprintf_unlocked (FILE *, const char *, ...); #undef fread_unlocked #undef fwrite_unlocked +/* Include <string> before "safe-ctype.h" to avoid GCC poisoning + the ctype macros through safe-ctype.h */ + +#ifdef __cplusplus +# include <string> +#endif + /* There are an extraordinary number of issues with <ctype.h>. The last straw is that it varies with the locale. Use libiberty's replacement instead. */ |