folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

SCP: Avoid potential macro redefinition for strcasecmp() and strncasecmp()

Browse source
This commit is contained in:
Mark Pizzolato 2017-04-24 13:44:40 -07:00
parent 1a8bc50130
commit b5a5aec57a
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scp.h
View file

@ -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); size_t sim_strlcpy (char *dst, const char *src, size_t size);
#define strlcpy(dst, src, size) sim_strlcpy((dst), (src), (size)) #define strlcpy(dst, src, size) sim_strlcpy((dst), (src), (size))
#define strlcat(dst, src, size) sim_strlcat((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)) #define strncasecmp(str1, str2, len) sim_strncasecmp((str1), (str2), (len))
#endif
#ifndef strcasecmp
#define strcasecmp(str1, str2) sim_strcasecmp ((str1), (str2)) #define strcasecmp(str1, str2) sim_strcasecmp ((str1), (str2))
#endif
CONST char *get_sim_opt (int32 opt, CONST char *cptr, t_stat *st); 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 *put_switches (char *buf, size_t bufsize, uint32 sw);
CONST char *get_glyph (const char *iptr, char *optr, char mchar); CONST char *get_glyph (const char *iptr, char *optr, char mchar);

2
slirp_glue/config-host.h
View file

@ -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); int qemu_recv (int s, void *buf, size_t len, int flags);
#ifdef _MSC_VER #ifdef _MSC_VER
#define snprintf _snprintf #define snprintf _snprintf
#ifndef strcasecmp
#define strcasecmp stricmp #define strcasecmp stricmp
#endif
#define inline #define inline
#else #else
#ifndef _WIN32 #ifndef _WIN32