gcc/gcc/system.h

@@ -194,6 +194,28 @@ 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
+#ifdef INCLUDE_STRING
+# include <string>
+#endif
+#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.  */
+#include "safe-ctype.h"
+
+#include <sys/types.h>
+
+#include <errno.h>
+
+#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO
+extern int errno;
+#endif
+
 #ifdef __cplusplus
 #if defined (INCLUDE_ALGORITHM) || !defined (HAVE_SWAP_IN_UTILITY)
 # include <algorithm>
@@ -207,11 +229,6 @@ extern int fprintf_unlocked (FILE *, const char *, ...);
 #ifdef INCLUDE_SET
 # include <set>
 #endif
-/* Include <string> before "safe-ctype.h" to avoid GCC poisoning
-   the ctype macros through safe-ctype.h */
-#ifdef INCLUDE_STRING
-# include <string>
-#endif
 #ifdef INCLUDE_VECTOR
 # include <vector>
 #endif
@@ -228,17 +245,6 @@ extern int fprintf_unlocked (FILE *, const char *, ...);
 # include <type_traits>
 #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.  */
-#include "safe-ctype.h"
-#include <sys/types.h>
-#include <errno.h>
-
-#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO
-extern int errno;
-#endif
-
 /* Some of glibc's string inlines cause warnings.  Plus we'd rather
    rely on (and therefore test) GCC's string builtins.  */
 #define __NO_STRING_INLINES

gcc/libcc1/libcc1plugin.cc

@@ -31,7 +31,6 @@
 #undef PACKAGE_TARNAME
 #undef PACKAGE_VERSION
 
-#define INCLUDE_VECTOR
 #define INCLUDE_MEMORY
 #include "gcc-plugin.h"
 #include "system.h"
@@ -70,6 +69,7 @@
 #include "gcc-c-interface.h"
 #include "context.hh"
 
+#include <vector>
 
 using namespace cc1_plugin;
 

gcc/libcc1/libcp1plugin.cc

@@ -33,7 +33,6 @@
 #undef PACKAGE_VERSION
 
 #define INCLUDE_MEMORY
-#define INCLUDE_VECTOR
 #include "gcc-plugin.h"
 #include "system.h"
 #include "coretypes.h"
@@ -72,6 +71,7 @@
 #include "rpc.hh"
 #include "context.hh"
 
+#include <vector>
 
 using namespace cc1_plugin;