susumu.yata
null+****@clear*****
Thu Jun 5 12:10:32 JST 2014
susumu.yata 2014-06-05 12:10:32 +0900 (Thu, 05 Jun 2014) New Revision: 94e58f876b5ac11ee6598ed3dd25bd8424903e92 https://github.com/groonga/groonga/commit/94e58f876b5ac11ee6598ed3dd25bd8424903e92 Message: Use _strtoui64 if both HAVE_STRTOULL and HAVE__STRTOUI64 are defined This change fixes a build error of Maria DB 10.0.11 with Mroonga 4.03 on Windows + Visual Studio 2010 Professional. Note that Visual Studio 2013 supports strtoull(). Redmine: fixes #2597 Modified files: lib/groonga_in.h Modified: lib/groonga_in.h (+3 -5) =================================================================== --- lib/groonga_in.h 2014-06-05 13:15:44 +0900 (18218b0) +++ lib/groonga_in.h 2014-06-05 12:10:32 +0900 (322cd9d) @@ -697,11 +697,9 @@ grn_str_greater(const uint8_t *ap, uint32_t as, const uint8_t *bp, uint32_t bs) point_->longitude = lo_;\ } while (0) -#ifndef HAVE_STRTOULL -# ifdef HAVE__STRTOUI64 -# define strtoull(nptr,endptr,base) _strtoui64(nptr,endptr,base) -# endif /* HAVE__STRTOUI64 */ -#endif /* HAVE_STRTOULL */ +#ifdef HAVE__STRTOUI64 +# define strtoull(nptr,endptr,base) _strtoui64(nptr,endptr,base) +#endif /* HAVE__STRTOUI64 */ #ifdef USE_FUTEX # include <linux/futex.h> -------------- next part -------------- HTML����������������������������...Télécharger
