aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Kenner <kenner@gcc.gnu.org>1995-06-20 18:17:47 -0400
committerRichard Kenner <kenner@gcc.gnu.org>1995-06-20 18:17:47 -0400
commit3df5fe73bd1ba68ff293fbcd13a581fac501ac4f (patch)
treed6ecafdff0f221d0ebd1f0a586443eb6976d1a81
parent6bc85e79525c2b226121dbcc8e15824f7d44f055 (diff)
downloadgcc-3df5fe73bd1ba68ff293fbcd13a581fac501ac4f.zip
gcc-3df5fe73bd1ba68ff293fbcd13a581fac501ac4f.tar.gz
gcc-3df5fe73bd1ba68ff293fbcd13a581fac501ac4f.tar.bz2
(default_include): Use name and two ints to be compatible with
definition of INCLUDE_DEFAULTS. From-SVN: r10019
-rw-r--r--gcc/protoize.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/gcc/protoize.c b/gcc/protoize.c
index 058c92d..fdcf289 100644
--- a/gcc/protoize.c
+++ b/gcc/protoize.c
@@ -295,39 +295,39 @@ static const int hash_mask = (HASH_TABLE_SIZE - 1);
#define LOCAL_INCLUDE_DIR "/usr/local/include"
#endif
-struct default_include { const char *fname; int cplusplus; } include_defaults[]
+struct default_include { const char *fname; int x1, x2; } include_defaults[]
#ifdef INCLUDE_DEFAULTS
= INCLUDE_DEFAULTS;
#else
= {
/* Pick up GNU C++ specific include files. */
- { GPLUSPLUS_INCLUDE_DIR, 1},
+ { GPLUSPLUS_INCLUDE_DIR, 1, 1 },
#ifdef CROSS_COMPILE
/* This is the dir for fixincludes. Put it just before
the files that we fix. */
- { GCC_INCLUDE_DIR, 0},
+ { GCC_INCLUDE_DIR, 0, 0 },
/* For cross-compilation, this dir name is generated
automatically in Makefile.in. */
- { CROSS_INCLUDE_DIR, 0 },
+ { CROSS_INCLUDE_DIR, 0, 0 },
/* This is another place that the target system's headers might be. */
- { TOOL_INCLUDE_DIR, 0},
+ { TOOL_INCLUDE_DIR, 0, 0 },
#else /* not CROSS_COMPILE */
/* This should be /use/local/include and should come before
the fixincludes-fixed header files. */
- { LOCAL_INCLUDE_DIR, 0},
+ { LOCAL_INCLUDE_DIR, 0, 1 },
/* This is here ahead of GCC_INCLUDE_DIR because assert.h goes here.
Likewise, behind LOCAL_INCLUDE_DIR, where glibc puts its assert.h. */
- { TOOL_INCLUDE_DIR, 0},
+ { TOOL_INCLUDE_DIR, 0, 0 },
/* This is the dir for fixincludes. Put it just before
the files that we fix. */
- { GCC_INCLUDE_DIR, 0},
+ { GCC_INCLUDE_DIR, 0, 0 },
/* Some systems have an extra dir of include files. */
#ifdef SYSTEM_INCLUDE_DIR
- { SYSTEM_INCLUDE_DIR, 0},
+ { SYSTEM_INCLUDE_DIR, 0, 0 },
#endif
- { STANDARD_INCLUDE_DIR, 0},
+ { STANDARD_INCLUDE_DIR, 0, 0},
#endif /* not CROSS_COMPILE */
- { 0, 0}
+ { 0, 0, 0}
};
#endif /* no INCLUDE_DEFAULTS */