From 17d2a464ad42c47ec37870e4b01a18ef5593877f Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Thu, 13 Nov 2008 18:56:55 +0000 Subject: Refactor configure script detection of functions used to set sockets into non-blocking mode, and decouple function detection from function capability. --- src/Makefile.netware | 3 ++- src/config-riscos.h | 5 ++++- src/config-win32.h | 12 +++++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/Makefile.netware b/src/Makefile.netware index 1ec0b8254..6b02935f2 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -449,12 +449,13 @@ endif @echo $(DL)#define HAVE_ASSERT_H 1$(DL) >> $@ @echo $(DL)#define HAVE_ERR_H 1$(DL) >> $@ @echo $(DL)#define HAVE_FCNTL_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_FIONBIO 1$(DL) >> $@ @echo $(DL)#define HAVE_GETHOSTBYADDR 1$(DL) >> $@ @echo $(DL)#define HAVE_GETHOSTBYNAME 1$(DL) >> $@ @echo $(DL)#define HAVE_GETPROTOBYNAME 1$(DL) >> $@ @echo $(DL)#define HAVE_GMTIME_R 1$(DL) >> $@ @echo $(DL)#define HAVE_INET_ADDR 1$(DL) >> $@ + @echo $(DL)#define HAVE_IOCTL 1$(DL) >> $@ + @echo $(DL)#define HAVE_IOCTL_FIONBIO 1$(DL) >> $@ @echo $(DL)#define HAVE_LL 1$(DL) >> $@ @echo $(DL)#define HAVE_LOCALE_H 1$(DL) >> $@ @echo $(DL)#define HAVE_LOCALTIME_R 1$(DL) >> $@ diff --git a/src/config-riscos.h b/src/config-riscos.h index bb27a0d02..dc5a4c7d6 100644 --- a/src/config-riscos.h +++ b/src/config-riscos.h @@ -374,5 +374,8 @@ #define IOCTL_3_ARGS -#define HAVE_FIONBIO +/* Define if you have the ioctl function. */ +#define HAVE_IOCTL +/* Define if you have a working ioctl FIONBIO function. */ +#define HAVE_IOCTL_FIONBIO diff --git a/src/config-win32.h b/src/config-win32.h index 8b18bd5c0..337d4e798 100644 --- a/src/config-win32.h +++ b/src/config-win32.h @@ -72,15 +72,21 @@ /* FUNCTIONS */ /* ---------------------------------------------------------------- */ -/* Define if you have the setmode function. */ -#define HAVE_SETMODE 1 - /* Define if you have the ftruncate function. */ #define HAVE_FTRUNCATE 1 +/* Define if you have the ioctlsocket function. */ +#define HAVE_IOCTLSOCKET 1 + +/* Define if you have a working ioctlsocket FIONBIO function. */ +#define HAVE_IOCTLSOCKET_FIONBIO 1 + /* Define if you have the setlocale function. */ #define HAVE_SETLOCALE 1 +/* Define if you have the setmode function. */ +#define HAVE_SETMODE 1 + /* Define if you have the strcasecmp function. */ /* #define HAVE_STRCASECMP 1 */ -- cgit v1.2.3