mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 10:31:54 +01:00
Merge work:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/work
This commit is contained in:
commit
f717ea99b3
2 changed files with 9 additions and 2 deletions
|
@ -3,4 +3,5 @@ monty@narttu.mysql.fi
|
||||||
mwagner@work.mysql.com
|
mwagner@work.mysql.com
|
||||||
sasha@mysql.sashanet.com
|
sasha@mysql.sashanet.com
|
||||||
serg@serg.mysql.com
|
serg@serg.mysql.com
|
||||||
|
tim@threads.polyesthetic.msg
|
||||||
yfaktoro@nslinuxw2.bedford.progress.com
|
yfaktoro@nslinuxw2.bedford.progress.com
|
||||||
|
|
10
acinclude.m4
10
acinclude.m4
|
@ -41,14 +41,20 @@ then
|
||||||
CXXFLAGS="$CXXFLAGS -Werror"
|
CXXFLAGS="$CXXFLAGS -Werror"
|
||||||
fi
|
fi
|
||||||
mysql_cv_btype_last_arg_accept=none
|
mysql_cv_btype_last_arg_accept=none
|
||||||
[AC_TRY_COMPILE([#include <stdlib.h>
|
[AC_TRY_COMPILE([#if defined(inline)
|
||||||
|
#undef inline
|
||||||
|
#endif
|
||||||
|
#include <stdlib.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
],
|
],
|
||||||
[int a = accept(1, (struct sockaddr *) 0, (socklen_t *) 0); return (a != 0);],
|
[int a = accept(1, (struct sockaddr *) 0, (socklen_t *) 0); return (a != 0);],
|
||||||
mysql_cv_btype_last_arg_accept=socklen_t)]
|
mysql_cv_btype_last_arg_accept=socklen_t)]
|
||||||
if test $mysql_cv_btype_last_arg_accept = none; then
|
if test $mysql_cv_btype_last_arg_accept = none; then
|
||||||
[AC_TRY_COMPILE([#include <stdlib.h>
|
[AC_TRY_COMPILE([#if defined(inline)
|
||||||
|
#undef inline
|
||||||
|
#endif
|
||||||
|
#include <stdlib.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
],
|
],
|
||||||
|
|
Loading…
Add table
Reference in a new issue