diff options
author | Marc Aldorasi <marc@groundctl.com> | 2021-05-18 13:35:00 -0400 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2021-05-19 00:36:01 +0200 |
commit | f6b325a5094460d39d478dd810bed822eba318c6 (patch) | |
tree | b606f2047bf4ca7658168a4b76937b443652e868 /lib | |
parent | 6c347d4f36a0cb2086d09c9c777629d0737d49f2 (diff) | |
download | curl-f6b325a5094460d39d478dd810bed822eba318c6.tar.gz |
config: remove now-unused macros
Closes #7094
Diffstat (limited to 'lib')
-rw-r--r-- | lib/config-amigaos.h | 7 | ||||
-rw-r--r-- | lib/config-dos.h | 9 | ||||
-rw-r--r-- | lib/config-mac.h | 7 | ||||
-rw-r--r-- | lib/config-os400.h | 19 | ||||
-rw-r--r-- | lib/config-plan9.h | 7 | ||||
-rw-r--r-- | lib/config-riscos.h | 18 | ||||
-rw-r--r-- | lib/config-tpf.h | 33 | ||||
-rw-r--r-- | lib/config-vxworks.h | 18 | ||||
-rw-r--r-- | lib/config-win32.h | 22 | ||||
-rw-r--r-- | lib/config-win32ce.h | 18 | ||||
-rw-r--r-- | lib/curl_config.h.cmake | 18 | ||||
-rw-r--r-- | lib/curl_setup.h | 1 |
12 files changed, 2 insertions, 175 deletions
diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h index 381bf302c..c2f5bd20b 100644 --- a/lib/config-amigaos.h +++ b/lib/config-amigaos.h @@ -128,13 +128,6 @@ # define LONG_MIN (-0x7fffffffL-1) #endif -#define HAVE_GETNAMEINFO 1 -#define GETNAMEINFO_QUAL_ARG1 const -#define GETNAMEINFO_TYPE_ARG1 struct sockaddr * -#define GETNAMEINFO_TYPE_ARG2 int -#define GETNAMEINFO_TYPE_ARG46 size_t -#define GETNAMEINFO_TYPE_ARG7 int - #define HAVE_RECV 1 #define RECV_TYPE_ARG1 long #define RECV_TYPE_ARG2 char * diff --git a/lib/config-dos.h b/lib/config-dos.h index 0fb98e385..6859208ab 100644 --- a/lib/config-dos.h +++ b/lib/config-dos.h @@ -45,7 +45,6 @@ #define HAVE_FCNTL_H 1 #define HAVE_FREEADDRINFO 1 #define HAVE_GETADDRINFO 1 -#define HAVE_GETNAMEINFO 1 #define HAVE_GETPROTOBYNAME 1 #define HAVE_GETTIMEOFDAY 1 #define HAVE_IO_H 1 @@ -93,7 +92,7 @@ #define STDC_HEADERS 1 #define TIME_WITH_SYS_TIME 1 -/* Qualifiers for send(), recv(), recvfrom() and getnameinfo(). */ +/* Qualifiers for send(), recv(), and recvfrom() */ #define SEND_TYPE_ARG1 int #define SEND_QUAL_ARG2 const @@ -117,12 +116,6 @@ #define RECVFROM_TYPE_RETV int #define RECVFROM_TYPE_ARG2_IS_VOID 1 -#define GETNAMEINFO_QUAL_ARG1 const -#define GETNAMEINFO_TYPE_ARG1 struct sockaddr * -#define GETNAMEINFO_TYPE_ARG2 int -#define GETNAMEINFO_TYPE_ARG46 int -#define GETNAMEINFO_TYPE_ARG7 int - #define BSD /* CURLDEBUG definition enables memory tracking */ diff --git a/lib/config-mac.h b/lib/config-mac.h index 163686ec9..c8833e300 100644 --- a/lib/config-mac.h +++ b/lib/config-mac.h @@ -85,13 +85,6 @@ #define SIZEOF_SHORT 2 #define SIZEOF_SIZE_T 4 -#define HAVE_GETNAMEINFO 1 -#define GETNAMEINFO_QUAL_ARG1 const -#define GETNAMEINFO_TYPE_ARG1 struct sockaddr * -#define GETNAMEINFO_TYPE_ARG2 socklen_t -#define GETNAMEINFO_TYPE_ARG46 size_t -#define GETNAMEINFO_TYPE_ARG7 int - #define HAVE_RECV 1 #define RECV_TYPE_ARG1 int #define RECV_TYPE_ARG2 void * diff --git a/lib/config-os400.h b/lib/config-os400.h index 428ce77a8..366db983f 100644 --- a/lib/config-os400.h +++ b/lib/config-os400.h @@ -449,25 +449,6 @@ /* Define if you have the ldap_url_parse procedure. */ /* #define HAVE_LDAP_URL_PARSE */ /* Disabled because of an IBM bug. */ -/* Define if you have the getnameinfo function. */ -/* OS400 has no ASCII version of this procedure: wrapped in setup-os400.h. */ -#define HAVE_GETNAMEINFO - -/* Define to the type qualifier of arg 1 for getnameinfo. */ -#define GETNAMEINFO_QUAL_ARG1 const - -/* Define to the type of arg 1 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG1 struct sockaddr * - -/* Define to the type of arg 2 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG2 socklen_t - -/* Define to the type of args 4 and 6 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG46 socklen_t - -/* Define to the type of arg 7 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG7 int - /* Define if you have the recv function. */ #define HAVE_RECV diff --git a/lib/config-plan9.h b/lib/config-plan9.h index ecfc27372..ce89309bc 100644 --- a/lib/config-plan9.h +++ b/lib/config-plan9.h @@ -54,13 +54,6 @@ #define SIZEOF_TIME_T 4 #endif -#define HAVE_GETNAMEINFO 1 -#define GETNAMEINFO_QUAL_ARG1 const -#define GETNAMEINFO_TYPE_ARG1 struct sockaddr * -#define GETNAMEINFO_TYPE_ARG2 int -#define GETNAMEINFO_TYPE_ARG46 long -#define GETNAMEINFO_TYPE_ARG7 int - #define HAVE_RECV 1 #define RECV_TYPE_ARG1 int #define RECV_TYPE_ARG2 void * diff --git a/lib/config-riscos.h b/lib/config-riscos.h index 6c9b584f5..13287e0a4 100644 --- a/lib/config-riscos.h +++ b/lib/config-riscos.h @@ -405,24 +405,6 @@ /* to disable LDAP */ #define CURL_DISABLE_LDAP -/* Define if you have the getnameinfo function. */ -#define HAVE_GETNAMEINFO 1 - -/* Define to the type qualifier of arg 1 for getnameinfo. */ -#define GETNAMEINFO_QUAL_ARG1 const - -/* Define to the type of arg 1 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG1 struct sockaddr * - -/* Define to the type of arg 2 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG2 socklen_t - -/* Define to the type of args 4 and 6 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG46 size_t - -/* Define to the type of arg 7 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG7 int - /* Define if you have the recv function. */ #define HAVE_RECV 1 diff --git a/lib/config-tpf.h b/lib/config-tpf.h index 0fa3fcdcf..12c34e18e 100644 --- a/lib/config-tpf.h +++ b/lib/config-tpf.h @@ -77,18 +77,6 @@ /* Define if struct sockaddr_in6 has the sin6_scope_id member */ /* #undef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID */ -/* Define to the type of arg 1 for getnameinfo. */ -/* #undef GETNAMEINFO_TYPE_ARG1 */ - -/* Define to the type of arg 2 for getnameinfo. */ -/* #undef GETNAMEINFO_TYPE_ARG2 */ - -/* Define to the type of args 4 and 6 for getnameinfo. */ -/* #undef GETNAMEINFO_TYPE_ARG46 */ - -/* Define to the type of arg 7 for getnameinfo. */ -/* #undef GETNAMEINFO_TYPE_ARG7 */ - /* Define to 1 if you have the alarm function. */ #define HAVE_ALARM 1 @@ -162,9 +150,6 @@ /* gethostbyname_r() takes 6 args */ /* #undef HAVE_GETHOSTBYNAME_R_6 1 */ -/* Define to 1 if you have the getnameinfo function. */ -/* #undef HAVE_GETNAMEINFO */ - /* Define to 1 if you have the `getpass_r' function. */ /* #undef HAVE_GETPASS_R */ @@ -657,24 +642,6 @@ /* the signed version of size_t */ /* #undef ssize_t */ -/* Define to 1 if you have the getnameinfo function. */ -/* #undef HAVE_GETNAMEINFO 1 */ - -/* Define to the type qualifier of arg 1 for getnameinfo. */ -/* #undef GETNAMEINFO_QUAL_ARG1 const */ - -/* Define to the type of arg 1 for getnameinfo. */ -/* #undef GETNAMEINFO_TYPE_ARG1 struct sockaddr * */ - -/* Define to the type of arg 2 for getnameinfo. */ -/* #undef GETNAMEINFO_TYPE_ARG2 socklen_t */ - -/* Define to the type of args 4 and 6 for getnameinfo. */ -/* #undef GETNAMEINFO_TYPE_ARG46 size_t */ - -/* Define to the type of arg 7 for getnameinfo. */ -/* #undef GETNAMEINFO_TYPE_ARG7 int */ - /* Define to 1 if you have the recv function. */ #define HAVE_RECV 1 diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h index 435340ac6..8911b05e2 100644 --- a/lib/config-vxworks.h +++ b/lib/config-vxworks.h @@ -80,21 +80,6 @@ /* Define if you want to enable IPv6 support */ #define ENABLE_IPV6 1 -/* Define to the type qualifier of arg 1 for getnameinfo. */ -#define GETNAMEINFO_QUAL_ARG1 const - -/* Define to the type of arg 1 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG1 struct sockaddr * - -/* Define to the type of arg 2 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG2 socklen_t - -/* Define to the type of args 4 and 6 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG46 size_t - -/* Define to the type of arg 7 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG7 unsigned int - /* Specifies the number of arguments to getservbyport_r */ #define GETSERVBYPORT_R_ARGS 6 @@ -206,9 +191,6 @@ /* Define to 1 if you have a working getifaddrs function. */ /* #undef HAVE_GETIFADDRS */ -/* Define to 1 if you have the getnameinfo function. */ -#define HAVE_GETNAMEINFO 1 - /* Define to 1 if you have the `getpass_r' function. */ /* #undef HAVE_GETPASS_R */ diff --git a/lib/config-win32.h b/lib/config-win32.h index 2e060f95c..fc8153683 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -277,21 +277,6 @@ #define HAVE_UTIME 1 #endif -/* Define to the type qualifier of arg 1 for getnameinfo. */ -#define GETNAMEINFO_QUAL_ARG1 const - -/* Define to the type of arg 1 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG1 struct sockaddr * - -/* Define to the type of arg 2 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG2 socklen_t - -/* Define to the type of args 4 and 6 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG46 DWORD - -/* Define to the type of arg 7 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG7 int - /* Define if you have the recv function. */ #define HAVE_RECV 1 @@ -419,7 +404,6 @@ # undef HAVE_WS2TCPIP_H # undef HAVE_ERRNO_H # undef HAVE_GETHOSTNAME -# undef HAVE_GETNAMEINFO # undef LWIP_POSIX_SOCKETS_IO_NAMES # undef RECV_TYPE_ARG1 # undef RECV_TYPE_ARG3 @@ -450,7 +434,6 @@ #undef HAVE_WINSOCK2_H #undef HAVE_WS2TCPIP_H #define HAVE_GETADDRINFO - #define HAVE_GETNAMEINFO #define HAVE_SYS_IOCTL_H #define HAVE_SYS_SOCKET_H #define HAVE_NETINET_IN_H @@ -580,7 +563,7 @@ Vista # endif #endif -/* Availability of freeaddrinfo, getaddrinfo, getnameinfo and if_nametoindex +/* Availability of freeaddrinfo, getaddrinfo, and if_nametoindex functions is quite convoluted, compiler dependent and even build target dependent. */ #if defined(HAVE_WS2TCPIP_H) @@ -588,17 +571,14 @@ Vista # define HAVE_FREEADDRINFO 1 # define HAVE_GETADDRINFO 1 # define HAVE_GETADDRINFO_THREADSAFE 1 -# define HAVE_GETNAMEINFO 1 # elif defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) # define HAVE_FREEADDRINFO 1 # define HAVE_GETADDRINFO 1 # define HAVE_GETADDRINFO_THREADSAFE 1 -# define HAVE_GETNAMEINFO 1 # elif defined(_MSC_VER) && (_MSC_VER >= 1200) # define HAVE_FREEADDRINFO 1 # define HAVE_GETADDRINFO 1 # define HAVE_GETADDRINFO_THREADSAFE 1 -# define HAVE_GETNAMEINFO 1 # endif #endif diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h index fb29e088f..44cc02887 100644 --- a/lib/config-win32ce.h +++ b/lib/config-win32ce.h @@ -219,24 +219,6 @@ /* Define if you have the utime function */ #define HAVE_UTIME 1 -/* Define if you have the getnameinfo function. */ -#define HAVE_GETNAMEINFO 1 - -/* Define to the type qualifier of arg 1 for getnameinfo. */ -#define GETNAMEINFO_QUAL_ARG1 const - -/* Define to the type of arg 1 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG1 struct sockaddr * - -/* Define to the type of arg 2 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG2 socklen_t - -/* Define to the type of args 4 and 6 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG46 DWORD - -/* Define to the type of arg 7 for getnameinfo. */ -#define GETNAMEINFO_TYPE_ARG7 int - /* Define if you have the recv function. */ #define HAVE_RECV 1 diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index 1f298871e..6da7489cd 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -112,21 +112,6 @@ /* Define if you want to enable IPv6 support */ #cmakedefine ENABLE_IPV6 1 -/* Define to the type qualifier of arg 1 for getnameinfo. */ -#cmakedefine GETNAMEINFO_QUAL_ARG1 ${GETNAMEINFO_QUAL_ARG1} - -/* Define to the type of arg 1 for getnameinfo. */ -#cmakedefine GETNAMEINFO_TYPE_ARG1 ${GETNAMEINFO_TYPE_ARG1} - -/* Define to the type of arg 2 for getnameinfo. */ -#cmakedefine GETNAMEINFO_TYPE_ARG2 ${GETNAMEINFO_TYPE_ARG2} - -/* Define to the type of args 4 and 6 for getnameinfo. */ -#cmakedefine GETNAMEINFO_TYPE_ARG46 ${GETNAMEINFO_TYPE_ARG46} - -/* Define to the type of arg 7 for getnameinfo. */ -#cmakedefine GETNAMEINFO_TYPE_ARG7 ${GETNAMEINFO_TYPE_ARG7} - /* Specifies the number of arguments to getservbyport_r */ #cmakedefine GETSERVBYPORT_R_ARGS ${GETSERVBYPORT_R_ARGS} @@ -247,9 +232,6 @@ /* Define to 1 if you have a working getifaddrs function. */ #cmakedefine HAVE_GETIFADDRS 1 -/* Define to 1 if you have the getnameinfo function. */ -#cmakedefine HAVE_GETNAMEINFO 1 - /* Define to 1 if you have the `getpass_r' function. */ #cmakedefine HAVE_GETPASS_R 1 diff --git a/lib/curl_setup.h b/lib/curl_setup.h index 004accdf1..5f4e4244a 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -517,7 +517,6 @@ # undef HAVE_GETADDRINFO_THREADSAFE # undef HAVE_FREEADDRINFO # undef HAVE_GETADDRINFO -# undef HAVE_GETNAMEINFO # undef ENABLE_IPV6 # endif #endif |