From: Junio C Hamano Date: Sat, 1 Dec 2018 12:41:45 +0000 (+0900) Subject: Merge branch 'ss/msvc-strcasecmp' X-Git-Tag: v2.20.0-rc2~2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c0e286a3d24045fc32824f7790d600e9a0fe312c?hp=623370493673d27c1994ea4394f123e4ed0a20bc Merge branch 'ss/msvc-strcasecmp' MSVC update. * ss/msvc-strcasecmp: msvc: directly use MS version (_stricmp) of strcasecmp --- diff --git a/compat/msvc.h b/compat/msvc.h index 580bb55bf4..29a8ce8204 100644 --- a/compat/msvc.h +++ b/compat/msvc.h @@ -10,18 +10,12 @@ #define inline __inline #define __inline__ __inline #define __attribute__(x) +#define strcasecmp _stricmp #define strncasecmp _strnicmp #define ftruncate _chsize #define strtoull _strtoui64 #define strtoll _strtoi64 -static __inline int strcasecmp (const char *s1, const char *s2) -{ - int size1 = strlen(s1); - int sisz2 = strlen(s2); - return _strnicmp(s1, s2, sisz2 > size1 ? sisz2 : size1); -} - #undef ERROR #include "compat/mingw.h"