From b5a5aec57a228ce2ff6628f498038611f500d04a Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Mon, 24 Apr 2017 13:44:40 -0700 Subject: [PATCH] SCP: Avoid potential macro redefinition for strcasecmp() and strncasecmp() --- scp.h | 4 ++++ slirp_glue/config-host.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/scp.h b/scp.h index 0b3228cb..e4b21366 100644 --- a/scp.h +++ b/scp.h @@ -162,8 +162,12 @@ size_t sim_strlcat (char *dst, const char *src, size_t size); size_t sim_strlcpy (char *dst, const char *src, size_t size); #define strlcpy(dst, src, size) sim_strlcpy((dst), (src), (size)) #define strlcat(dst, src, size) sim_strlcat((dst), (src), (size)) +#ifndef strncasecmp #define strncasecmp(str1, str2, len) sim_strncasecmp((str1), (str2), (len)) +#endif +#ifndef strcasecmp #define strcasecmp(str1, str2) sim_strcasecmp ((str1), (str2)) +#endif CONST char *get_sim_opt (int32 opt, CONST char *cptr, t_stat *st); const char *put_switches (char *buf, size_t bufsize, uint32 sw); CONST char *get_glyph (const char *iptr, char *optr, char mchar); diff --git a/slirp_glue/config-host.h b/slirp_glue/config-host.h index 1e737d65..bff61560 100644 --- a/slirp_glue/config-host.h +++ b/slirp_glue/config-host.h @@ -24,7 +24,9 @@ int qemu_setsockopt (int s, int level, int optname, void *optval, int optlen); int qemu_recv (int s, void *buf, size_t len, int flags); #ifdef _MSC_VER #define snprintf _snprintf +#ifndef strcasecmp #define strcasecmp stricmp +#endif #define inline #else #ifndef _WIN32