From 899f921c722bb99c04598caa227edb4e4a1093e8 Mon Sep 17 00:00:00 2001
From: metze <metze@0c0555d6-39d7-0310-84fc-f1cc0bd64818>
Date: Thu, 25 Oct 2007 06:53:38 +0000
Subject: - 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

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25724 0c0555d6-39d7-0310-84fc-f1cc0bd64818
(This used to be commit e56977ea459b3615d33237d19ed8e7ad8b509853)
---
 source3/lib/replace/system/network.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'source3/lib/replace/system')

diff --git a/source3/lib/replace/system/network.h b/source3/lib/replace/system/network.h
index 44a1dcc8e1..5de363f134 100644
--- a/source3/lib/replace/system/network.h
+++ b/source3/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
-- 
cgit