The Great Renaming, Part 2: prefix strcasecmp and strncasecmp with yasm__.
svn path=/trunk/yasm/; revision=841
diff --git a/libyasm/strcasecmp.c b/libyasm/strcasecmp.c
index 1a948d5..a7b2a92 100644
--- a/libyasm/strcasecmp.c
+++ b/libyasm/strcasecmp.c
@@ -42,7 +42,7 @@
#include <ctype.h>
int
-strcasecmp(const char *s1, const char *s2)
+yasm__strcasecmp(const char *s1, const char *s2)
{
const unsigned char
*us1 = (const unsigned char *)s1,
@@ -55,7 +55,7 @@
}
int
-strncasecmp(const char *s1, const char *s2, size_t n)
+yasm__strncasecmp(const char *s1, const char *s2, size_t n)
{
const unsigned char
*us1 = (const unsigned char *)s1,
diff --git a/libyasm/util.h b/libyasm/util.h
index 53d875d..4236844 100644
--- a/libyasm/util.h
+++ b/libyasm/util.h
@@ -82,21 +82,24 @@
/*@null@*/ char *strsep(char **stringp, const char *delim);
#endif
-#ifndef HAVE_STRCASECMP
+#ifdef HAVE_STRCASECMP
+# define yasm__strcasecmp(x, y) strcasecmp(x, y)
+# define yasm__strncasecmp(x, y) strncasecmp(x, y)
+#else
# ifdef HAVE_STRICMP
-# define strcasecmp(x, y) stricmp(x, y)
-# define strncasecmp(x, y) strnicmp(x, y)
+# define yasm__strcasecmp(x, y) stricmp(x, y)
+# define yasm__strncasecmp(x, y) strnicmp(x, y)
# elif HAVE_STRCMPI
-# define strcasecmp(x, y) strcmpi(x, y)
-# define strncasecmp(x, y) strncmpi(x, y)
+# define yasm__strcasecmp(x, y) strcmpi(x, y)
+# define yasm__strncasecmp(x, y) strncmpi(x, y)
# else
# define USE_OUR_OWN_STRCASECMP
# endif
#endif
#if defined(USE_OUR_OWN_STRCASECMP) || defined(lint)
-int strcasecmp(const char *s1, const char *s2);
-int strncasecmp(const char *s1, const char *s2, size_t n);
+int yasm__strcasecmp(const char *s1, const char *s2);
+int yasm__strncasecmp(const char *s1, const char *s2, size_t n);
#endif
#if !defined(HAVE_TOASCII) || defined(lint)
