diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-08-08 14:05:54 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-08-08 14:05:54 +0000 |
| commit | 49264ad7dd7d6f196c54c5b8750ef98edcbb0683 (patch) | |
| tree | 21d900ca63fbb9156d44fccdd84943f4c46dcb96 /newlib/libc | |
| parent | 1f232abc8938cc1fe821a6a8504b3845bad89522 (diff) | |
| download | newlib-49264ad7dd7d6f196c54c5b8750ef98edcbb0683.zip newlib-49264ad7dd7d6f196c54c5b8750ef98edcbb0683.tar.gz newlib-49264ad7dd7d6f196c54c5b8750ef98edcbb0683.tar.bz2 | |
* libc/posix/engine.c(dissect): Guard diagnostic pragma for right
versions of GCC only.
* libc/string/strcasestr.c: Ditto.
Fix typo in previous ChangeLog entry.
Diffstat (limited to 'newlib/libc')
| -rw-r--r-- | newlib/libc/posix/engine.c | 3 | ||||
| -rw-r--r-- | newlib/libc/string/strcasestr.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/newlib/libc/posix/engine.c b/newlib/libc/posix/engine.c index 5956e27..73ce45c 100644 --- a/newlib/libc/posix/engine.c +++ b/newlib/libc/posix/engine.c @@ -364,9 +364,12 @@ sopno stopst; char *ssp; /* start of string matched by subsubRE */ char *sep; /* end of string matched by subsubRE */ char *oldssp; /* previous ssp */ +#if defined (__GNUC__) && \ + ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4) /* dp is only used for assertion testing which, for some reason, is not recognized as usage. */ #pragma GCC diagnostic ignored "-Wunused-but-set-variable" +#endif char *dp; AT("diss", start, stop, startst, stopst); diff --git a/newlib/libc/string/strcasestr.c b/newlib/libc/string/strcasestr.c index 8ff91fd..9178316 100644 --- a/newlib/libc/string/strcasestr.c +++ b/newlib/libc/string/strcasestr.c @@ -84,8 +84,11 @@ QUICKREF (!memchr ((h) + (h_l), '\0', (j) + (n_l) - (h_l)) \ && ((h_l) = (j) + (n_l))) # define CANON_ELEMENT(c) tolower (c) +#if defined (__GNUC__) && \ + ((__GNUC__ == 4 && __GNUC_MINOR__ >= 2) || __GNUC__ > 4) /* strncasecmp uses signed char, CMP_FUNC is expected to use unsigned char. */ #pragma GCC diagnostic ignored "-Wpointer-sign" +#endif # define CMP_FUNC strncasecmp # include "str-two-way.h" #endif |