diff options
| author | David O'Brien <obrien@FreeBSD.org> | 2002-04-03 03:40:56 +0000 |
|---|---|---|
| committer | David O'Brien <obrien@gcc.gnu.org> | 2002-04-03 03:40:56 +0000 |
| commit | 058b12757e42cba6708dd350e43ebb71c8655bf5 (patch) | |
| tree | 5808d0466015bd7dc23c6d0f23ce8f0005c3afc0 /gcc/protoize.c | |
| parent | 5add6d1a6d7221a24424c78a6eff9981e281043c (diff) | |
| download | gcc-058b12757e42cba6708dd350e43ebb71c8655bf5.zip gcc-058b12757e42cba6708dd350e43ebb71c8655bf5.tar.gz gcc-058b12757e42cba6708dd350e43ebb71c8655bf5.tar.bz2 | |
protoize.c: Match include directory usage with cppdefault.c.
2002-04-02 David O'Brien <obrien@FreeBSD.org>
* protoize.c: Match include directory usage with cppdefault.c.
Approved by: Richard Henderson <rth@redhat.com>
Message-ID: <20020329131400.C19829@redhat.com>
From-SVN: r51787
Diffstat (limited to 'gcc/protoize.c')
| -rw-r--r-- | gcc/protoize.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/gcc/protoize.c b/gcc/protoize.c index f8d8a9e..25c7933 100644 --- a/gcc/protoize.c +++ b/gcc/protoize.c @@ -197,14 +197,6 @@ static const int hash_mask = (HASH_TABLE_SIZE - 1); /* Make a table of default system include directories just as it is done in cpp. */ -#ifndef STANDARD_INCLUDE_DIR -#define STANDARD_INCLUDE_DIR "/usr/include" -#endif - -#ifndef LOCAL_INCLUDE_DIR -#define LOCAL_INCLUDE_DIR "/usr/local/include" -#endif - static const struct default_include { const char *const fname; const char *const component; const int x1, x2; } include_defaults[] @@ -215,29 +207,43 @@ static const struct default_include { const char *const fname; /* Pick up GNU C++ specific include files. */ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 }, #ifdef CROSS_COMPILE +#ifdef GCC_INCLUDE_DIR /* This is the dir for fixincludes. Put it just before the files that we fix. */ { GCC_INCLUDE_DIR, "GCC", 0, 0 }, +#endif +#ifdef CROSS_INCLUDE_DIR /* For cross-compilation, this dir name is generated automatically in Makefile.in. */ { CROSS_INCLUDE_DIR, 0, 0, 0 }, +#endif +#ifdef TOOL_INCLUDE_DIR /* This is another place that the target system's headers might be. */ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 0 }, +#endif #else /* not CROSS_COMPILE */ +#ifdef LOCAL_INCLUDE_DIR /* This should be /use/local/include and should come before the fixincludes-fixed header files. */ { LOCAL_INCLUDE_DIR, 0, 0, 1 }, +#endif +#ifdef TOOL_INCLUDE_DIR /* 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, "BINUTILS", 0, 0 }, +#endif +#ifdef GCC_INCLUDE_DIR /* This is the dir for fixincludes. Put it just before the files that we fix. */ { GCC_INCLUDE_DIR, "GCC", 0, 0 }, +#endif /* Some systems have an extra dir of include files. */ #ifdef SYSTEM_INCLUDE_DIR { SYSTEM_INCLUDE_DIR, 0, 0, 0 }, #endif +#ifdef STANDARD_INCLUDE_DIR { STANDARD_INCLUDE_DIR, 0, 0, 0}, +#endif #endif /* not CROSS_COMPILE */ { 0, 0, 0, 0} }; |