Navigation Menu

Skip to content

Commit

Permalink
Use _strtoui64 if both HAVE_STRTOULL and HAVE__STRTOUI64 are defined
Browse files Browse the repository at this point in the history
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
  • Loading branch information
s-yata committed Jun 5, 2014
1 parent 5a3c58c commit 94e58f8
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions lib/groonga_in.h
Expand Up @@ -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>
Expand Down

0 comments on commit 94e58f8

Please sign in to comment.