diff options
| author | unknown <serg@serg.mylan> | 2005-05-01 23:10:55 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-05-01 23:10:55 +0200 |
| commit | 07357b93a7775e055ba81fb6b24766ab0f89274f (patch) | |
| tree | 0a41aa330429f40b1c6866922006bfb0cb59b1ef /config | |
| parent | 07918c8c177d23418c382abf1490c33924a45df0 (diff) | |
| parent | 186e5cd2298cc51c13f80967480b12a3f13b5dfa (diff) | |
| download | mariadb-git-07357b93a7775e055ba81fb6b24766ab0f89274f.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Makefile.am:
Auto merged
client/mysqladmin.cc:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/misc.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4 index 201702e5379..d75dedafa2a 100644 --- a/config/ac-macros/misc.m4 +++ b/config/ac-macros/misc.m4 @@ -646,8 +646,8 @@ m4_define([_AC_PROG_CXX_EXIT_DECLARATION], 'void exit (int);' \ '#include <stdlib.h>' do - _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include <stdlib.h> -$ac_declaration], + _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$ac_declaration +@%:@include <stdlib.h>], [exit (42);])], [], [continue]) |