Kouhei Sutou
null+****@clear*****
Thu Apr 16 21:31:52 JST 2015
Kouhei Sutou 2015-04-16 21:31:52 +0900 (Thu, 16 Apr 2015) New Revision: 55befa127755f30076e7d12f0c881fc2d9500913 https://github.com/groonga/groonga/commit/55befa127755f30076e7d12f0c881fc2d9500913 Message: windows: always use _write() on Windows Modified files: build/ac_macros/check_functions.m4 config.h.cmake include/groonga/portability.h lib/ii.c Modified: build/ac_macros/check_functions.m4 (+0 -1) =================================================================== --- build/ac_macros/check_functions.m4 2015-04-16 21:27:22 +0900 (2e5e94a) +++ build/ac_macros/check_functions.m4 2015-04-16 21:31:52 +0900 (1a6fac6) @@ -14,4 +14,3 @@ AC_CHECK_FUNCS(read) AC_CHECK_FUNCS(strcasecmp) AC_CHECK_FUNCS(strncasecmp) AC_CHECK_FUNCS(strtoull) -AC_CHECK_FUNCS(write) Modified: config.h.cmake (+0 -1) =================================================================== --- config.h.cmake 2015-04-16 21:27:22 +0900 (1962b5b) +++ config.h.cmake 2015-04-16 21:31:52 +0900 (c8a7897) @@ -154,6 +154,5 @@ #cmakedefine HAVE_STRCASECMP #cmakedefine HAVE_STRNCASECMP #cmakedefine HAVE_STRTOULL -#cmakedefine HAVE_WRITE #cmakedefine HAVE_PTHREAD_MUTEXATTR_SETPSHARED #cmakedefine HAVE_PTHREAD_CONDATTR_SETPSHARED Modified: include/groonga/portability.h (+6 -0) =================================================================== --- include/groonga/portability.h 2015-04-16 21:27:22 +0900 (aabcbba) +++ include/groonga/portability.h 2015-04-16 21:31:52 +0900 (274bbba) @@ -109,4 +109,10 @@ snprintf((dest), (n), (format), __VA_ARGS__) #endif /* WIN32 */ +#ifdef WIN32 +# define grn_write(fd, buf, count) _write((fd), (buf), (count)) +#else +# define grn_write(fd, buf, count) write((fd), (buf), (count)) +#endif /* WIN32 */ + #endif /* GROONGA_PORTABILITY_H */ Modified: lib/ii.c (+1 -1) =================================================================== --- lib/ii.c 2015-04-16 21:27:22 +0900 (469f2fb) +++ lib/ii.c 2015-04-16 21:31:52 +0900 (c36236e) @@ -7224,7 +7224,7 @@ grn_ii_buffer_flush(grn_ctx *ctx, grn_ii_buffer *ii_buffer) encode_postings(ctx, ii_buffer, outbuf); encode_last_tf(ctx, ii_buffer, outbuf); { - ssize_t r = GRN_WRITE(ii_buffer->tmpfd, outbuf, encsize); + ssize_t r = grn_write(ii_buffer->tmpfd, outbuf, encsize); if (r != encsize) { ERR(GRN_INPUT_OUTPUT_ERROR, "write returned %" GRN_FMT_LLD " != %" GRN_FMT_LLU, (long long int)r, (unsigned long long int)encsize); -------------- next part -------------- HTML����������������������������...Download
