Changeset 79e6ccdd in rtems

Timestamp:

06/12/07 16:45:40 (15 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

44a5bb7

Parents:

df1aa03

Message:

2007-06-12 Ralf Corsépius <ralf.corsepius@…>

• shttpd/defs.h: Eliminate my_strncasecmp.
• shttpd/string.c: Eliminate my_strncasecmp.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• shttpd/defs.h (modified) (1 diff)
• shttpd/string.c (modified) (2 diffs)

cpukit/ChangeLog

@@ +1 @@
+2007-06-12      Ralf Corsépius <ralf.corsepius@rtems.org>
+
+        * shttpd/defs.h: Eliminate my_strncasecmp.
+        * shttpd/string.c: Eliminate my_strncasecmp.
+
 2007-06-12      Ralf Corsépius <ralf.corsepius@rtems.org>
 

cpukit/shttpd/defs.h

@@ -382 +382 @@
 #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 <string.h> */
+#include <string.h>
+#else
+#include <strings.h>
+#endif
+#define my_strncasecmp(s1,s2,l) strncasecmp(s1,s2,l)
+#endif
 
 #ifndef HAVE_STRNDUP

cpukit/shttpd/string.c

@@ -21 +21 @@
 #endif
 
+#ifndef HAVE_STRNCASECMP
 int
 my_strncasecmp(const char *str1, const char *str2, size_t len)
@@ -34 +35 @@
         return (ret);
 }
+#endif
 
 #ifndef HAVE_STRNDUP