Commit f717ea99 authored by tim@threads.polyesthetic.msg's avatar tim@threads.polyesthetic.msg
Browse files

Merge work:/home/bk/mysql 

into threads.polyesthetic.msg:/usr/local/src/my/work
parents 16a493ea 03e19fc3

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -3,4 +3,5 @@ monty@narttu.mysql.fi 
mwagner@work.mysql.com

sasha@mysql.sashanet.com

serg@serg.mysql.com

tim@threads.polyesthetic.msg

yfaktoro@nslinuxw2.bedford.progress.com

acinclude.m4

+8 −2
Original line number Diff line number Diff line
@@ -41,14 +41,20 @@ then 
  CXXFLAGS="$CXXFLAGS -Werror"

fi

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/socket.h>

],

[int a = accept(1, (struct sockaddr *) 0, (socklen_t *) 0); return (a != 0);],

mysql_cv_btype_last_arg_accept=socklen_t)]

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/socket.h>

],