--- a/fixincludes/fixlib.h	Sun Aug 21 07:07:55 2011 +0900
+++ b/fixincludes/fixlib.h	Fri Oct 27 22:46:09 2017 +0900
@@ -3,7 +3,7 @@
    files which are fixed to work correctly with ANSI C and placed in a
    directory that GCC will search.
 
-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2009
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2009, 2012
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -140,7 +140,10 @@
          "amount of user entertainment" )            \
                                                      \
   _ENV_( pz_find_base, BOOL_TRUE, "FIND_BASE",       \
-         "leader to trim from file names" )
+         "leader to trim from file names" )          \
+                                                     \
+  _ENV_( pz_test_mode, BOOL_FALSE, "TEST_MODE",      \
+         "run fixincludes in test mode" )
 
 #define _ENV_(v,m,n,t)   extern tCC* v;
 ENV_TABLE
@@ -158,7 +161,7 @@
     */
 typedef enum
 {
-  TT_TEST, TT_EGREP, TT_NEGREP, TT_FUNCTION
+  TT_TEST, TT_EGREP, TT_NEGREP, TT_FUNCTION, TT_CKSUM
 } te_test_type;
 
 typedef struct test_desc tTestDesc;
@@ -211,6 +214,27 @@
 
 extern int gnu_type_map_ct;
 
+typedef enum {
+  VERB_SILENT = 0,
+  VERB_FIXES,
+  VERB_APPLIES,
+  VERB_PROGRESS,
+  VERB_TESTS,
+  VERB_EVERYTHING
+} te_verbose;
+
+extern te_verbose  verbose_level;
+
+#define VLEVEL(l)  ((unsigned int) verbose_level >= (unsigned int) l)
+#define NOT_SILENT VLEVEL(VERB_FIXES)
+
+typedef enum {
+  TESTING_OFF = 0,
+  TESTING_ON  = 1
+} fixinc_mode_t;
+
+extern fixinc_mode_t fixinc_mode;
+
 #ifdef HAVE_MMAP_FILE
 #define UNLOAD_DATA() do { if (curr_data_mapped) { \
   munmap ((void*)pz_curr_data, data_map_size); close (data_map_fd); } \
@@ -245,4 +269,19 @@
 t_bool mn_get_regexps ( regex_t** label_re, regex_t** name_re, tCC *who );
 
 void   initialize_opts ( void );
+
+#if defined(__MINGW32__)
+
+void   fix_path_separators ( char* p );
+
+/* prepend shell name to command passed to system call */
+int    system_with_shell ( char* s );
+
+#else
+
+/* normal call */
+#define system_with_shell system
+
+#endif /* defined(__MINGW32__) */
+
 #endif /* ! GCC_FIXLIB_H */