Kouhei Sutou
null+****@clear*****
Fri Jan 30 17:45:26 JST 2015
Kouhei Sutou 2015-01-30 17:45:26 +0900 (Fri, 30 Jan 2015) New Revision: 0e2717023c36ea07d66266a22cc770edeb34456a https://github.com/groonga/groonga/commit/0e2717023c36ea07d66266a22cc770edeb34456a Message: windows: add missing "_" prefix... Modified files: build/ac_macros/check_functions.m4 config.h.cmake lib/ctx.c lib/str.c Modified: build/ac_macros/check_functions.m4 (+2 -2) =================================================================== --- build/ac_macros/check_functions.m4 2015-01-30 17:27:26 +0900 (ee1878e) +++ build/ac_macros/check_functions.m4 2015-01-30 17:45:26 +0900 (72e3a9a) @@ -1,12 +1,12 @@ # -*- autoconf -*- +AC_CHECK_FUNCS(_gmtime64_s) +AC_CHECK_FUNCS(_localtime64_s) AC_CHECK_FUNCS(_stricmp) AC_CHECK_FUNCS(_strnicmp) AC_CHECK_FUNCS(_strtoui64) AC_CHECK_FUNCS(close) -AC_CHECK_FUNCS(gmtime64_s) AC_CHECK_FUNCS(gmtime_r) -AC_CHECK_FUNCS(localtime64_s) AC_CHECK_FUNCS(localtime_r) AC_CHECK_FUNCS(mkostemp) AC_CHECK_FUNCS(open) Modified: config.h.cmake (+2 -2) =================================================================== --- config.h.cmake 2015-01-30 17:27:26 +0900 (8998d48) +++ config.h.cmake 2015-01-30 17:45:26 +0900 (23263de) @@ -133,6 +133,8 @@ #cmakedefine HAVE_MECAB_DICTIONARY_INFO_T /* functions */ +#cmakedefine HAVE__GMTIME64_S +#cmakedefine HAVE__LOCALTIME64_S #cmakedefine HAVE__STRICMP #cmakedefine HAVE__STRNICMP #cmakedefine HAVE__STRTOUI64 @@ -141,9 +143,7 @@ #cmakedefine HAVE_CLOCK_GETTIME #cmakedefine HAVE_CLOSE #cmakedefine HAVE_FPCLASSIFY -#cmakedefine HAVE_GMTIME64_S #cmakedefine HAVE_GMTIME_R -#cmakedefine HAVE_LOCALTIME64_S #cmakedefine HAVE_LOCALTIME_R #cmakedefine HAVE_MKOSTEMP #cmakedefine HAVE_OPEN Modified: lib/ctx.c (+3 -3) =================================================================== --- lib/ctx.c 2015-01-30 17:27:26 +0900 (b9e4e79) +++ lib/ctx.c 2015-01-30 17:45:26 +0900 (80691cf) @@ -134,12 +134,12 @@ grn_timeval2str(grn_ctx *ctx, grn_timeval *tv, char *buf) { struct tm *ltm; const char *function_name; -#ifdef HAVE_LOCALTIME64_S +#ifdef HAVE__LOCALTIME64_S struct tm tm; time_t t = tv->tv_sec; function_name = "localtime_s"; ltm = (localtime_s(&tm, &t) == 0) ? &tm : NULL; -#else /* HAVE_LOCALTIME64_S */ +#else /* HAVE__LOCALTIME64_S */ # ifdef HAVE_LOCALTIME_R struct tm tm; time_t t = tv->tv_sec; @@ -150,7 +150,7 @@ grn_timeval2str(grn_ctx *ctx, grn_timeval *tv, char *buf) function_name = "localtime"; ltm = localtime(&tvsec); # endif /* HAVE_LOCALTIME_R */ -#endif /* HAVE_LOCALTIME64_S */ +#endif /* HAVE__LOCALTIME64_S */ if (!ltm) { SERR(function_name); } snprintf(buf, GRN_TIMEVAL_STR_SIZE - 1, GRN_TIMEVAL_STR_FORMAT, ltm->tm_year + 1900, ltm->tm_mon + 1, ltm->tm_mday, Modified: lib/str.c (+3 -3) =================================================================== --- lib/str.c 2015-01-30 17:27:26 +0900 (63efbc9) +++ lib/str.c 2015-01-30 17:45:26 +0900 (eb70396) @@ -2441,11 +2441,11 @@ grn_text_time2rfc1123(grn_ctx *ctx, grn_obj *bulk, int sec) { time_t tsec; struct tm *t; -#ifdef HAVE_GMTIME64_S +#ifdef HAVE__GMTIME64_S struct tm tm; tsec = (time_t)sec; t = (gmtime_s(&tm, &tsec) == 0) ? &tm : NULL; -#else /* HAVE_GMTIME_S */ +#else /* HAVE__GMTIME64_S */ # ifdef HAVE_GMTIME_R struct tm tm; tsec = (time_t)sec; @@ -2454,7 +2454,7 @@ grn_text_time2rfc1123(grn_ctx *ctx, grn_obj *bulk, int sec) tsec = (time_t)sec; t = gmtime(&tsec); # endif /* HAVE_GMTIME_R */ -#endif /* HAVE_GMTIME_S */ +#endif /* HAVE__GMTIME64_S */ if (t) { GRN_TEXT_SET(ctx, bulk, weekdays[t->tm_wday], 3); GRN_TEXT_PUTS(ctx, bulk, ", "); -------------- next part -------------- HTML����������������������������...Download