diff options
| author | Yang Tse <yangsita@gmail.com> | 2008-09-24 19:13:01 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2008-09-24 19:13:01 +0000 |
| commit | 4d437416daee0f626988b8c056ae9cd22486c655 (patch) | |
| tree | fa0c53d82e00e6ba7670c3fec8278a6cf773bbe3 /lib | |
| parent | 267b942383465f8d9ff193e4deaa0d383a09d6b7 (diff) | |
| download | curl-4d437416daee0f626988b8c056ae9cd22486c655.tar.gz | |
HAVE_INET_PTON will only be defined when an IPv6 capable working
inet_pton function is available.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.netware | 1 | ||||
| -rw-r--r-- | lib/config-symbian.h | 10 | ||||
| -rw-r--r-- | lib/config-tpf.h | 8 | ||||
| -rw-r--r-- | lib/config.dos | 1 | ||||
| -rw-r--r-- | lib/inet_pton.h | 5 |
5 files changed, 9 insertions, 16 deletions
diff --git a/lib/Makefile.netware b/lib/Makefile.netware index a2aa1623f..619aa55be 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -404,7 +404,6 @@ else @echo $(DL)#define OS "i586-pc-libc-NetWare"$(DL) >> $@ @echo $(DL)#define HAVE_FTRUNCATE 1$(DL) >> $@ @echo $(DL)#define HAVE_GETTIMEOFDAY 1$(DL) >> $@ - @echo $(DL)#define HAVE_INET_PTON 1$(DL) >> $@ @echo $(DL)#define HAVE_INTTYPES_H 1$(DL) >> $@ @echo $(DL)#define HAVE_LIMITS_H 1$(DL) >> $@ @echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@ diff --git a/lib/config-symbian.h b/lib/config-symbian.h index 3f0ddf158..d35443f2c 100644 --- a/lib/config-symbian.h +++ b/lib/config-symbian.h @@ -222,8 +222,11 @@ /* Define to 1 if you have the `inet_addr' function. */ /*#define HAVE_INET_ADDR 1*/ -/* Define to 1 if you have the `inet_pton' function. */ -#define HAVE_INET_PTON 1 +/* Define to 1 if you have a IPv6 capable working inet_ntop function. */ +/*#define HAVE_INET_NTOP 1*/ + +/* Define to 1 if you have a IPv6 capable working inet_pton function. */ +/*#define HAVE_INET_PTON 1*/ /* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 @@ -330,9 +333,6 @@ /* Define to 1 if NI_WITHSCOPEID exists and works. */ /*#define HAVE_NI_WITHSCOPEID 1*/ -/* Defined if no inet_pton() prototype available */ -/* #undef HAVE_NO_INET_PTON_PROTO */ - /* we have no strerror_r() proto */ /* #undef HAVE_NO_STRERROR_R_DECL */ diff --git a/lib/config-tpf.h b/lib/config-tpf.h index 35231976a..35c44ed70 100644 --- a/lib/config-tpf.h +++ b/lib/config-tpf.h @@ -208,7 +208,10 @@ /* Define to 1 if you have the `inet_addr' function. */ #define HAVE_INET_ADDR 1 -/* Define to 1 if you have the `inet_pton' function. */ +/* Define to 1 if you have a IPv6 capable working inet_ntop function. */ +/* #undef HAVE_INET_NTOP */ + +/* Define to 1 if you have a IPv6 capable working inet_pton function. */ /* #undef HAVE_INET_PTON */ /* Define to 1 if you have the <inttypes.h> header file. */ @@ -290,9 +293,6 @@ /* Define if NI_WITHSCOPEID exists and works */ /* #undef HAVE_NI_WITHSCOPEID */ -/* Defined if no inet_pton() prototype available */ -/* #undef HAVE_NO_INET_PTON_PROTO */ - /* we have no strerror_r() proto */ /* #undef HAVE_NO_STRERROR_R_DECL */ diff --git a/lib/config.dos b/lib/config.dos index 7f40bdf86..de751da12 100644 --- a/lib/config.dos +++ b/lib/config.dos @@ -24,7 +24,6 @@ #define HAVE_GETTIMEOFDAY 1 #define HAVE_IO_H 1 #define HAVE_IOCTLSOCKET 1 -#define HAVE_INET_PTON 1 #define HAVE_LOCALE_H 1 #define HAVE_LONGLONG 1 #define HAVE_MEMORY_H 1 diff --git a/lib/inet_pton.h b/lib/inet_pton.h index a659a9774..8331ba9dc 100644 --- a/lib/inet_pton.h +++ b/lib/inet_pton.h @@ -28,11 +28,6 @@ int Curl_inet_pton(int, const char *, void *); #ifdef HAVE_INET_PTON - -#if defined(HAVE_NO_INET_PTON_PROTO) -int inet_pton(int af, const char *src, void *dst); -#endif - #ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> #endif |