firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 20:03:02 +01:00
Code Issues

Some cleanup

Browse Source
This commit is contained in:
aafemt 2003-02-10 05:42:22 +00:00
parent 9671306605
commit 8c121969c8
4 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
configure.in
View File

@ -1,4 +1,4 @@
dnl $Id: configure.in,v 1.110 2003-01-29 15:29:01 skidder Exp $
dnl $Id: configure.in,v 1.111 2003-02-10 05:42:19 aafemt Exp $
dnl ############################# INITIALISATION ###############################
@ -100,7 +100,7 @@ case "$target" in
MAKEFILE_PREFIX=mingw
PLATFORM=win32
AC_DEFINE(WIN_NT)
LOCK_MANAGER_FLG=Y
LOCK_MANAGER_FLG=N
EDITLINE_FLG=N
;;
@ -287,6 +287,7 @@ AC_CHECK_HEADERS(rpc/xdr.h,,,[#include <rpc/rpc.h>])
AC_CHECK_HEADERS(aio.h)
AC_CHECK_HEADERS(mntent.h mnttab.h sys/mntent.h sys/mnttab.h)
AC_CHECK_HEADERS(sys/ipc.h sys/file.h)
AC_CHECK_HEADERS(winsock2.h)
dnl Check for libraries
AC_CHECK_LIB(dl, main)
@ -329,13 +330,8 @@ if test "$ac_cv_func_gettimeofday" = "yes"; then
esac
fi
AC_CHECK_FUNCS(time times)
AC_CHECK_FUNCS(gethostname connect)
if test "$ac_cv_func_gethostname" = "no"; then
AC_CHECK_LIB(nsl, gethostname, XE_APPEND(-lnsl,LIBS))
fi
if test "$ac_cv_func_connect" = "no"; then
AC_CHECK_LIB(socket, connect, XE_APPEND(-lsocket,LIBS),, $LIBS)
fi
AC_SEARCH_LIBS(gethostname,nsl)
AC_SEARCH_LIBS(connect,socket)
AC_CHECK_FUNCS(strcasecmp stricmp)
if test "$ac_cv_func_strcasecmp" = "no" -a "$ac_cv_func_stricmp" = "no"; then
dnl EKU: On SINIX-Z strcasecmp is in libresolv.
@ -344,14 +340,7 @@ if test "$ac_cv_func_strcasecmp" = "no" -a "$ac_cv_func_stricmp" = "no"; then
unset ac_cv_func_strcasecmp
AC_CHECK_FUNCS(strcasecmp)],, $LIBS)
fi
AC_CHECK_FUNCS(dirname)
if test "$ac_cv_func_dirname" = "no"; then
dnl EKU: On SINIX-Z dirname is in libgen.
AC_CHECK_LIB(gen, dirname,
[XE_APPEND(-lgen,LIBS)
unset ac_cv_func_dirname
AC_CHECK_FUNCS(dirname)],, $LIBS)
fi
AC_SEARCH_LIBS(dirname,gen)
AC_CHECK_FUNCS(sigaction setitimer)
AC_CHECK_FUNCS(snprintf)
AC_FUNC_MMAP
@ -381,11 +370,10 @@ AC_C_BIGENDIAN
AC_C_CONST dnl EKU: we should replace the CONST define in the source!!!
AC_C_VOLATILE
AC_TYPE_SIGNAL
AC_CHECK_TYPE(socklen_t,int)
AC_SYS_LARGEFILE
AC_CHECK_SIZEOF(void*)
AC_CHECK_SIZEOF(long)
AC_CHECK_TYPE(semun)
AC_CHECK_TYPES([socklen_t,semun])
AC_CHECK_TYPES([struct XDR::xdr_ops],,,[#include <rpc/rpc.h>
#include <rpc/xdr.h>])
AC_CHECK_TYPES([struct xdr_ops],,,[#include <rpc/rpc.h>
@ -464,7 +452,7 @@ case "$PLATFORM" in
[FB_PIPE_NAME=${withval}])
AC_DEFINE_UNQUOTED(FB_PIPE_NAME,"$FB_PIPE_NAME")
AC_SUBST(FB_PIPE_NAME)
XE_PREPEND(-lversion,LIBS)
XE_PREPEND(-lversion -lmpr -lws2_32,LIBS)
;;
*)

2
src/include/gen/autoconfig_msvc.h
View File

@ -118,7 +118,7 @@
/* Types */
#undef socklen_t
#undef HAVE_SOCKLEN_T
/* gettimeofday accepts second (timezone) argument */
#undef GETTIMEOFDAY_RETURNS_TIMEZONE

4
src/make.new/config/config.h.in
View File

@ -1,4 +1,4 @@
#ident "$Id: config.h.in,v 1.66 2003-01-16 16:28:28 skidder Exp $"
#ident "$Id: config.h.in,v 1.67 2003-02-10 05:42:20 aafemt Exp $"
/*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete ports:
@ -97,7 +97,7 @@
/* Types */
#undef socklen_t
#undef HAVE_SOCKLEN_T
/* gettimeofday accepts second (timezone) argument */
#undef GETTIMEOFDAY_RETURNS_TIMEZONE

5
src/remote/inet.cpp
View File

@ -41,7 +41,7 @@
*
*/
/*
$Id: inet.cpp,v 1.47 2003-01-15 14:08:11 dimitr Exp $
$Id: inet.cpp,v 1.48 2003-02-10 05:42:21 aafemt Exp $
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
@ -151,7 +151,10 @@ extern int h_errno;
#define INET_RETRY_ERRNO WSAEINPROGRESS
#define INET_ADDR_IN_USE WSAEADDRINUSE
#define sleep(seconds) Sleep ((seconds) * 1000)
#ifndef HAVE_SOCKLEN_T
typedef int socklen_t;
#endif
/*
** Winsock has a typedef for socket, so #define SOCKET to the typedef here