diff options
author | RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> | 2023-02-19 14:39:08 +0100 |
---|---|---|
committer | RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> | 2023-02-19 14:39:08 +0100 |
commit | 74b6984047d330a3cc7cb7f63645849fe7676c63 (patch) | |
tree | 65a26800103d8d66f7e6cb4acfbfc9f315ec750b /gl/arpa_inet.in.h | |
parent | 423284edfa980fc3fdb51ab20af96685a988ba97 (diff) | |
parent | c07206f2ccc2356aa74bc6813a94c2190017d44e (diff) | |
download | monitoring-plugins-74b6984047d330a3cc7cb7f63645849fe7676c63.tar.gz |
Merge branch 'master' into check_icmp_cleanup
Diffstat (limited to 'gl/arpa_inet.in.h')
-rw-r--r-- | gl/arpa_inet.in.h | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/gl/arpa_inet.in.h b/gl/arpa_inet.in.h index ba89e977..80e6713f 100644 --- a/gl/arpa_inet.in.h +++ b/gl/arpa_inet.in.h | |||
@@ -1,19 +1,19 @@ | |||
1 | /* A GNU-like <arpa/inet.h>. | 1 | /* A GNU-like <arpa/inet.h>. |
2 | 2 | ||
3 | Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc. | 3 | Copyright (C) 2005-2006, 2008-2023 Free Software Foundation, Inc. |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This file is free software: you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU Lesser General Public License as |
7 | the Free Software Foundation; either version 3, or (at your option) | 7 | published by the Free Software Foundation; either version 2.1 of the |
8 | any later version. | 8 | License, or (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This file is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU Lesser General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU Lesser General Public License |
16 | along with this program; if not, see <http://www.gnu.org/licenses/>. */ | 16 | along with this program. If not, see <https://www.gnu.org/licenses/>. */ |
17 | 17 | ||
18 | #ifndef _@GUARD_PREFIX@_ARPA_INET_H | 18 | #ifndef _@GUARD_PREFIX@_ARPA_INET_H |
19 | 19 | ||
@@ -49,6 +49,12 @@ | |||
49 | #ifndef _@GUARD_PREFIX@_ARPA_INET_H | 49 | #ifndef _@GUARD_PREFIX@_ARPA_INET_H |
50 | #define _@GUARD_PREFIX@_ARPA_INET_H | 50 | #define _@GUARD_PREFIX@_ARPA_INET_H |
51 | 51 | ||
52 | /* Get all possible declarations of inet_ntop() and inet_pton(). */ | ||
53 | #if (@GNULIB_INET_NTOP@ || @GNULIB_INET_PTON@ || defined GNULIB_POSIXCHECK) \ | ||
54 | && @HAVE_WS2TCPIP_H@ | ||
55 | # include <ws2tcpip.h> | ||
56 | #endif | ||
57 | |||
52 | /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ | 58 | /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ |
53 | 59 | ||
54 | /* The definition of _GL_ARG_NONNULL is copied here. */ | 60 | /* The definition of _GL_ARG_NONNULL is copied here. */ |
@@ -70,8 +76,8 @@ | |||
70 | the return value is NULL and errno is set to ENOSPC. A good value | 76 | the return value is NULL and errno is set to ENOSPC. A good value |
71 | for CNT is 46. | 77 | for CNT is 46. |
72 | 78 | ||
73 | For more details, see the POSIX:2001 specification | 79 | For more details, see the POSIX:2008 specification |
74 | <http://www.opengroup.org/susv3xsh/inet_ntop.html>. */ | 80 | <https://pubs.opengroup.org/onlinepubs/9699919799/functions/inet_ntop.html>. */ |
75 | # if @REPLACE_INET_NTOP@ | 81 | # if @REPLACE_INET_NTOP@ |
76 | # if !(defined __cplusplus && defined GNULIB_NAMESPACE) | 82 | # if !(defined __cplusplus && defined GNULIB_NAMESPACE) |
77 | # undef inet_ntop | 83 | # undef inet_ntop |
@@ -97,7 +103,9 @@ _GL_CXXALIAS_SYS_CAST (inet_ntop, const char *, | |||
97 | (int af, const void *restrict src, | 103 | (int af, const void *restrict src, |
98 | char *restrict dst, socklen_t cnt)); | 104 | char *restrict dst, socklen_t cnt)); |
99 | # endif | 105 | # endif |
106 | # if __GLIBC__ >= 2 | ||
100 | _GL_CXXALIASWARN (inet_ntop); | 107 | _GL_CXXALIASWARN (inet_ntop); |
108 | # endif | ||
101 | #elif defined GNULIB_POSIXCHECK | 109 | #elif defined GNULIB_POSIXCHECK |
102 | # undef inet_ntop | 110 | # undef inet_ntop |
103 | # if HAVE_RAW_DECL_INET_NTOP | 111 | # if HAVE_RAW_DECL_INET_NTOP |
@@ -126,7 +134,9 @@ _GL_FUNCDECL_SYS (inet_pton, int, | |||
126 | _GL_CXXALIAS_SYS (inet_pton, int, | 134 | _GL_CXXALIAS_SYS (inet_pton, int, |
127 | (int af, const char *restrict src, void *restrict dst)); | 135 | (int af, const char *restrict src, void *restrict dst)); |
128 | # endif | 136 | # endif |
137 | # if __GLIBC__ >= 2 | ||
129 | _GL_CXXALIASWARN (inet_pton); | 138 | _GL_CXXALIASWARN (inet_pton); |
139 | # endif | ||
130 | #elif defined GNULIB_POSIXCHECK | 140 | #elif defined GNULIB_POSIXCHECK |
131 | # undef inet_pton | 141 | # undef inet_pton |
132 | # if HAVE_RAW_DECL_INET_PTON | 142 | # if HAVE_RAW_DECL_INET_PTON |