diff options
author | ghazi <ghazi@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-09-03 06:52:00 +0000 |
---|---|---|
committer | ghazi <ghazi@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-09-03 06:52:00 +0000 |
commit | 259a120e2ed841f4806427ef156d99cf3646d9e7 (patch) | |
tree | 9e61a0b27315e42bdf092bca252dacbc8c333d21 /gcc/system.h | |
parent | 016523bb897c93ae63ac79d635c718f48f585353 (diff) | |
download | gcc-259a120e2ed841f4806427ef156d99cf3646d9e7.tar.gz |
* aclocal.m4 (GCC_HEADER_STRING): New macro to detect if it is
safe to include both string.h and strings.h together.
(GCC_NEED_DECLARATION): Test STRING_WITH_STRINGS when deciding
which headers to search for function declarations. Continue to
prefer string.h over strings.h when both are not acceptable.
* acconfig.h (STRING_WITH_STRINGS): Add stub.
* configure.in: Call GCC_HEADER_STRING.
* system.h: Test STRING_WITH_STRINGS when deciding which headers
to include. Continue to prefer string.h over strings.h when both
are not acceptable.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@22204 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/system.h')
-rw-r--r-- | gcc/system.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gcc/system.h b/gcc/system.h index e16cd2ea312..541b30de793 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -88,11 +88,16 @@ extern int errno; #endif -#ifdef HAVE_STRING_H +#ifdef STRING_WITH_STRINGS # include <string.h> +# include <strings.h> #else -# ifdef HAVE_STRINGS_H -# include <strings.h> +# ifdef HAVE_STRING_H +# include <string.h> +# else +# ifdef HAVE_STRINGS_H +# include <strings.h> +# endif # endif #endif |