From 79e6ccdde5e38095d21663064e9cc43dfedef6fe Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 12 Jun 2007 16:45:40 +0000 Subject: =?UTF-8?q?2007-06-12=09Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * shttpd/defs.h: Eliminate my_strncasecmp. * shttpd/string.c: Eliminate my_strncasecmp. --- cpukit/ChangeLog | 5 +++++ cpukit/shttpd/defs.h | 10 ++++++++++ cpukit/shttpd/string.c | 2 ++ 3 files changed, 17 insertions(+) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index bd713fe643..a2ece02959 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2007-06-12 Ralf Corsépius + + * shttpd/defs.h: Eliminate my_strncasecmp. + * shttpd/string.c: Eliminate my_strncasecmp. + 2007-06-12 Ralf Corsépius * wrapup/Makefile.am: Pickup ../libmd/libmd.a. diff --git a/cpukit/shttpd/defs.h b/cpukit/shttpd/defs.h index a1e871a4f4..7a86992bbe 100644 --- a/cpukit/shttpd/defs.h +++ b/cpukit/shttpd/defs.h @@ -381,8 +381,18 @@ extern void my_strlcpy(register char *, register const char *, size_t); #define my_strlcpy(d,s,l) strlcpy(d,s,l) #endif +#ifndef HAVE_STRNCASECMP extern int my_strncasecmp(register const char *, register const char *, size_t); +#else +#ifdef __rtems__ +/* strncasecmp should be in strings.h, but newlib has it in */ +#include +#else +#include +#endif +#define my_strncasecmp(s1,s2,l) strncasecmp(s1,s2,l) +#endif #ifndef HAVE_STRNDUP extern char *my_strndup(const char *ptr, size_t len); diff --git a/cpukit/shttpd/string.c b/cpukit/shttpd/string.c index 34e5a721fa..d77f32c417 100644 --- a/cpukit/shttpd/string.c +++ b/cpukit/shttpd/string.c @@ -20,6 +20,7 @@ my_strlcpy(register char *dst, register const char *src, size_t n) } #endif +#ifndef HAVE_STRNCASECMP int my_strncasecmp(const char *str1, const char *str2, size_t len) { @@ -33,6 +34,7 @@ my_strncasecmp(const char *str1, const char *str2, size_t len) return (ret); } +#endif #ifndef HAVE_STRNDUP char * -- cgit v1.2.3