Commit 4e909ee8 authored by Yang Tse's avatar Yang Tse
Browse files

ntoa() and inet_ntoa_r() no longer used

parent 95df5d04

acinclude.m4

+0 −22
Original line number Diff line number Diff line
@@ -2601,28 +2601,6 @@ fi 
])





AC_DEFUN([CURL_CHECK_INET_NTOA_R],

[

  dnl determine if function definition for inet_ntoa_r exists.

  AC_CHECK_FUNCS(inet_ntoa_r,[

    AC_MSG_CHECKING(whether inet_ntoa_r is declared)

    AC_EGREP_CPP(inet_ntoa_r,[

#undef _REENTRANT

#include <arpa/inet.h>],[

      AC_DEFINE(HAVE_INET_NTOA_R_DECL, 1, [inet_ntoa_r() is declared])

      AC_MSG_RESULT(yes)],[

      AC_MSG_RESULT(no)

      AC_MSG_CHECKING(whether inet_ntoa_r with -D_REENTRANT is declared)

      AC_EGREP_CPP(inet_ntoa_r,[

#undef _REENTRANT

#define _REENTRANT

#include <arpa/inet.h>],[

        AC_DEFINE(HAVE_INET_NTOA_R_DECL, 1, [inet_ntoa_r() is declared])

        AC_MSG_RESULT(yes)],

        AC_MSG_RESULT(no))])])

])





dnl **********************************************************************

dnl CURL_DETECT_ICC ([ACTION-IF-YES])

dnl

ares/Makefile.netware

+0 −1
Original line number Diff line number Diff line
@@ -357,7 +357,6 @@ endif 
	@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_INET_NTOA 1$(DL) >> $@

	@echo $(DL)#define HAVE_LL 1$(DL) >> $@

	@echo $(DL)#define HAVE_LOCALTIME_R 1$(DL) >> $@

	@echo $(DL)#define HAVE_MALLOC_H 1$(DL) >> $@

configure.ac

+1 −2
Original line number Diff line number Diff line
@@ -1881,7 +1881,7 @@ else 
  dnl fi



  dnl poke around for inet_ntoa_r()

  CURL_CHECK_INET_NTOA_R()

  dnl the old inet_ntoa_r check was done here



  dnl is there a localtime_r()

  dnl the old localtime_r check was done here
@@ -2116,7 +2116,6 @@ AC_CHECK_FUNCS([basename \ 
  getrlimit \

  gettimeofday \

  inet_addr \

  inet_ntoa \

  inet_pton \

  perror \

  pipe \

lib/Makefile.inc

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \ 
HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h	\

  progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h	\

  if2ip.h speedcheck.h urldata.h curl_ldap.h ssluse.h escape.h telnet.h	\

  getinfo.h strequal.h krb4.h memdebug.h inet_ntoa_r.h http_chunks.h	\

  getinfo.h strequal.h krb4.h memdebug.h http_chunks.h	                \

  strtok.h connect.h llist.h hash.h content_encoding.h share.h		\

  curl_md5.h http_digest.h http_negotiate.h http_ntlm.h inet_pton.h	\

  strtoofft.h strerror.h inet_ntop.h curlx.h memory.h setup.h		\

lib/Makefile.netware

+0 −1
Original line number Diff line number Diff line
@@ -457,7 +457,6 @@ endif 
	@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_INET_NTOA 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) >> $@