diff options
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/configure.in | 1 | ||||
| -rw-r--r-- | innobase/ut/ut0ut.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/innobase/configure.in b/innobase/configure.in index b606ecfffc0..c234e1e192d 100644 --- a/innobase/configure.in +++ b/innobase/configure.in @@ -36,6 +36,7 @@ AC_PROG_RANLIB AC_PROG_INSTALL AC_CHECK_HEADERS(aio.h sched.h) AC_CHECK_SIZEOF(int, 4) +AC_CHECK_SIZEOF(long, 4) AC_CHECK_FUNCS(sched_yield) AC_CHECK_FUNCS(fdatasync) #AC_CHECK_FUNCS(localtime_r) # Already checked by MySQL diff --git a/innobase/ut/ut0ut.c b/innobase/ut/ut0ut.c index 7ee32b9a8e2..cd21491dcf1 100644 --- a/innobase/ut/ut0ut.c +++ b/innobase/ut/ut0ut.c @@ -27,11 +27,11 @@ ut_get_high32( /* out: a >> 32 */ ulint a) /* in: ulint */ { - if (sizeof(ulint) == 4) { - return(0); - } - +#if SIZEOF_LONG == 4 + return 0; +#else return(a >> 32); +#endif } /************************************************************ |