diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-10-25 06:53:38 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:43:29 +0100 |
| commit | 88f6c5a1d2c337ffe7505e20b96a6b47dab1c063 (patch) | |
| tree | 4ad31b42c6255c63cb0df157f6d64c78ffdde3e5 /source4/lib/replace/system/network.h | |
| parent | 1f680ef45d8ff95aca2834cd9005f03409019efd (diff) | |
| download | samba-88f6c5a1d2c337ffe7505e20b96a6b47dab1c063.tar.gz samba-88f6c5a1d2c337ffe7505e20b96a6b47dab1c063.tar.bz2 samba-88f6c5a1d2c337ffe7505e20b96a6b47dab1c063.zip | |
r25724: - include getaddrinfo.h after we have defined struct addrinfo
- use rep_ instead of pg_ as prefix in getaddrinfo.[ch]
- define HAVE_<name> macros when we replace functions
metze
(This used to be commit 57d5cf4b5fe8885b1375059aa143c9c71d2503b4)
Diffstat (limited to 'source4/lib/replace/system/network.h')
| -rw-r--r-- | source4/lib/replace/system/network.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source4/lib/replace/system/network.h b/source4/lib/replace/system/network.h index 44a1dcc8e1..5de363f134 100644 --- a/source4/lib/replace/system/network.h +++ b/source4/lib/replace/system/network.h @@ -93,10 +93,6 @@ int rep_inet_pton(int af, const char *src, void *dst); const char *rep_inet_ntop(int af, const void *src, char *dst, socklen_t size); #endif -#if !defined(HAVE_GETADDRINFO) -#include "getaddrinfo.h" -#endif - /* * Some systems have getaddrinfo but not the * defines needed to use it. @@ -212,6 +208,7 @@ typedef unsigned short int sa_family_t; #endif #ifndef HAVE_STRUCT_SOCKADDR_STORAGE +#define HAVE_STRUCT_SOCKADDR_STORAGE #ifdef HAVE_STRUCT_SOCKADDR_IN6 #define sockaddr_storage sockaddr_in6 #define ss_family sin6_family @@ -235,6 +232,10 @@ struct addrinfo { }; #endif /* HAVE_STRUCT_ADDRINFO */ +#if !defined(HAVE_GETADDRINFO) +#include "getaddrinfo.h" +#endif + #ifdef SOCKET_WRAPPER #ifndef SOCKET_WRAPPER_NOT_REPLACE #define SOCKET_WRAPPER_REPLACE |