Kouhei Sutou
null+****@clear*****
Mon Nov 24 17:43:21 JST 2014
Kouhei Sutou 2014-11-24 17:43:21 +0900 (Mon, 24 Nov 2014) New Revision: bc02e4791eb3cc9e6c60f03ecdb6e2abc03f5dbe https://github.com/groonga/groonga/commit/bc02e4791eb3cc9e6c60f03ecdb6e2abc03f5dbe Message: windows: use _strnicmp() preferentially GitHub: fix #248 Reported by Hiroshi Hatake. Thanks!!! Modified files: plugins/query_expanders/tsv.c plugins/suggest/suggest.c src/groonga.c Modified: plugins/query_expanders/tsv.c (+3 -5) =================================================================== --- plugins/query_expanders/tsv.c 2014-11-24 15:40:15 +0900 (92ebc1d) +++ plugins/query_expanders/tsv.c 2014-11-24 17:43:21 +0900 (8adc13a) @@ -25,11 +25,9 @@ #include <stdio.h> #include <string.h> -#ifndef HAVE_STRNCASECMP -# ifdef HAVE__STRNICMP -# define strncasecmp(s1,s2,n) _strnicmp(s1,s2,n) -# endif /* HAVE__STRNICMP */ -#endif /* HAVE_STRNCASECMP */ +#ifdef HAVE__STRNICMP +# define strncasecmp(s1,s2,n) _strnicmp(s1,s2,n) +#endif /* HAVE__STRNICMP */ #define MAX_SYNONYM_BYTES 4096 Modified: plugins/suggest/suggest.c (+3 -5) =================================================================== --- plugins/suggest/suggest.c 2014-11-24 15:40:15 +0900 (d615a8e) +++ plugins/suggest/suggest.c 2014-11-24 17:43:21 +0900 (955698b) @@ -23,11 +23,9 @@ #include <groonga/plugin.h> #include <string.h> -#ifndef HAVE_STRNCASECMP -# ifdef HAVE__STRNICMP -# define strncasecmp(s1,s2,n) _strnicmp(s1,s2,n) -# endif /* HAVE__STRNICMP */ -#endif /* HAVE_STRNCASECMP */ +#ifdef HAVE__STRNICMP +# define strncasecmp(s1,s2,n) _strnicmp(s1,s2,n) +#endif /* HAVE__STRNICMP */ #define VAR GRN_PROC_GET_VAR_BY_OFFSET #define CONST_STR_LEN(x) x, x ? sizeof(x) - 1 : 0 Modified: src/groonga.c (+3 -5) =================================================================== --- src/groonga.c 2014-11-24 15:40:15 +0900 (5435b40) +++ src/groonga.c 2014-11-24 17:43:21 +0900 (9a79336) @@ -53,11 +53,9 @@ # include <io.h> #endif /* HAVE_IO_H */ -#ifndef HAVE_STRNCASECMP -# ifdef HAVE__STRNICMP -# define strncasecmp(s1,s2,n) _strnicmp(s1,s2,n) -# endif /* HAVE__STRNICMP */ -#endif /* HAVE_STRNCASECMP */ +#ifdef HAVE__STRNICMP +# define strncasecmp(s1,s2,n) _strnicmp(s1,s2,n) +#endif /* HAVE__STRNICMP */ #ifndef USE_MSG_NOSIGNAL # ifdef MSG_NOSIGNAL -------------- next part -------------- HTML����������������������������...Download