Kouhei Sutou
null+****@clear*****
Thu Apr 16 23:44:14 JST 2015
Kouhei Sutou 2015-04-16 23:44:14 +0900 (Thu, 16 Apr 2015) New Revision: 2f0a0214b7dc8b763516162fe87ae5104dc9f6aa https://github.com/groonga/groonga/commit/2f0a0214b7dc8b763516162fe87ae5104dc9f6aa Message: Fix lseek related type Modified files: lib/grn.h lib/ii.c Modified: lib/grn.h (+2 -2) =================================================================== --- lib/grn.h 2015-04-16 23:42:12 +0900 (0a7cf7c) +++ lib/grn.h 2015-04-16 23:44:14 +0900 (86af64f) @@ -458,14 +458,14 @@ typedef int grn_cond; # else /* WIN64 */ # define GRN_FMT_SOCKET "u" # endif /* WIN64 */ -# define GRN_FMT_OFF_T GRN_FMT_LLD +# define GRN_FMT_OFF64_T GRN_FMT_LLD #else /* WIN32 */ # define GRN_FMT_LLD "lld" # define GRN_FMT_LLU "llu" # define GRN_FMT_SIZE "zu" # define GRN_FMT_SSIZE "zd" # define GRN_FMT_SOCKET "d" -# define GRN_FMT_OFF_T "jd" +# define GRN_FMT_OFF64_T "jd" #endif /* WIN32 */ #ifdef __GNUC__ Modified: lib/ii.c (+3 -2) =================================================================== --- lib/ii.c 2015-04-16 23:42:12 +0900 (e9eaa18) +++ lib/ii.c 2015-04-16 23:44:14 +0900 (c21b92f) @@ -7406,12 +7406,13 @@ grn_ii_buffer_fetch(grn_ctx *ctx, grn_ii_buffer *ii_buffer, } } { - off_t seeked_position; + off64_t seeked_position; seeked_position = grn_lseek(ii_buffer->tmpfd, block->head, SEEK_SET); if (seeked_position != block->head) { ERRNO_ERR("grn_lseek"); GRN_LOG(ctx, GRN_LOG_ERROR, - "failed to grn_lseek(%" GRN_FMT_OFF_T ") -> %" GRN_FMT_OFF_T, + "failed to " + "grn_lseek(%" GRN_FMT_OFF64_T ") -> %" GRN_FMT_OFF64_T, block->head, seeked_position); return; -------------- next part -------------- HTML����������������������������...Download