diff options
| author | serg@janus.mylan <> | 2006-08-10 11:04:09 +0200 |
|---|---|---|
| committer | serg@janus.mylan <> | 2006-08-10 11:04:09 +0200 |
| commit | 7d77c530380aaf2c358126fb69d9c1eb66b9d463 (patch) | |
| tree | 253610cdc397a3a8b7552c0e1dc011bc884f6947 | |
| parent | 2e7f47c6f894b9d8054877d9bd6843ce65c69ca8 (diff) | |
| parent | 12dc638abd820d813066a137e52ef49cd673e9ac (diff) | |
| download | mariadb-git-7d77c530380aaf2c358126fb69d9c1eb66b9d463.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/m51
| -rw-r--r-- | config/ac-macros/misc.m4 | 30 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | include/my_atomic.h | 8 |
3 files changed, 8 insertions, 32 deletions
diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4 index 3ed64b5625b..fdce85aa136 100644 --- a/config/ac-macros/misc.m4 +++ b/config/ac-macros/misc.m4 @@ -1,35 +1,5 @@ # Local macros for automake & autoconf -# A local version of AC_CHECK_SIZEOF that includes sys/types.h -dnl MYSQL_CHECK_SIZEOF(TYPE [, CROSS-SIZE]) -AC_DEFUN([MYSQL_CHECK_SIZEOF], -[changequote(<<, >>)dnl -dnl The name to #define. -define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl -dnl The cache variable name. -define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl -changequote([, ])dnl -AC_MSG_CHECKING(size of $1) -AC_CACHE_VAL(AC_CV_NAME, -[AC_TRY_RUN([#include <stdio.h> -#include <sys/types.h> -#if STDC_HEADERS -#include <stdlib.h> -#include <stddef.h> -#endif -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof($1)); - exit(0); -}], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$2], , , AC_CV_NAME=$2))])dnl -AC_MSG_RESULT($AC_CV_NAME) -AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [ ]) -undefine([AC_TYPE_NAME])dnl -undefine([AC_CV_NAME])dnl -]) - #---START: Used in for client configure AC_DEFUN([MYSQL_TYPE_ACCEPT], [ac_save_CXXFLAGS="$CXXFLAGS" diff --git a/configure.in b/configure.in index 14a20322e69..43db221e7b0 100644 --- a/configure.in +++ b/configure.in @@ -1687,7 +1687,7 @@ then AC_MSG_ERROR("MySQL needs a long long type.") fi # off_t is not a builtin type -MYSQL_CHECK_SIZEOF(off_t, 4) +AC_CHECK_SIZEOF(off_t, 4) if test "$ac_cv_sizeof_off_t" -eq 0 then AC_MSG_ERROR("MySQL needs a off_t type.") diff --git a/include/my_atomic.h b/include/my_atomic.h index c916026c0e0..9a319f84451 100644 --- a/include/my_atomic.h +++ b/include/my_atomic.h @@ -135,7 +135,13 @@ make_atomic_swap(ptr) #undef _atomic_h_cleanup_ #endif -typedef int32 intptr; /* TODO configure check */ +#if SIZEOF_CHARP == SIZEOF_INT +typedef int intptr; +#elif SIZEOF_CHARP == SIZEOF_LONG +typedef long intptr; +#else +#error +#endif #define MY_ATOMIC_OK 0 #define MY_ATOMIC_NOT_1CPU 1 |