diff options
| author | Rich Felker <dalias@aerifal.cx> | 2012-09-06 22:44:55 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2012-09-06 22:44:55 -0400 |
| commit | 400c5e5c8307a2ebe44ef1f203f5a15669f20347 (patch) | |
| tree | 087a48dc8251fa05f6866af8ebf96b69450b15ab /include/arpa | |
| parent | bac03cdde1137c16b4c194e137310e2748661dcc (diff) | |
| download | musl-400c5e5c8307a2ebe44ef1f203f5a15669f20347.zip musl-400c5e5c8307a2ebe44ef1f203f5a15669f20347.tar.gz musl-400c5e5c8307a2ebe44ef1f203f5a15669f20347.tar.bz2 | |
use restrict everywhere it's required by c99 and/or posix 2008
to deal with the fact that the public headers may be used with pre-c99
compilers, __restrict is used in place of restrict, and defined
appropriately for any supported compiler. we also avoid the form
[restrict] since older versions of gcc rejected it due to a bug in the
original c99 standard, and instead use the form *restrict.
Diffstat (limited to 'include/arpa')
| -rw-r--r-- | include/arpa/inet.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/arpa/inet.h b/include/arpa/inet.h index b604f60..82e2ac1 100644 --- a/include/arpa/inet.h +++ b/include/arpa/inet.h @@ -5,6 +5,12 @@ extern "C" { #endif +#if __STDC_VERSION__ >= 199901L +#define __restrict restrict +#elif !defined(__GNUC__) +#define __restrict +#endif + #include <netinet/in.h> #include <inttypes.h> @@ -24,8 +30,8 @@ uint16_t ntohs(uint16_t); in_addr_t inet_addr (const char *); char *inet_ntoa (struct in_addr); -int inet_pton (int, const char *, void *); -const char *inet_ntop (int, const void *, char *, socklen_t); +int inet_pton (int, const char *__restrict, void *__restrict); +const char *inet_ntop (int, const void *__restrict, char *__restrict, socklen_t); int inet_aton (const char *, struct in_addr *); /* nonstandard but widely used */ |