From 804396dce9112361c0e19ad2e15b9bb8dd23c378 Mon Sep 17 00:00:00 2001
From: metze <metze@0c0555d6-39d7-0310-84fc-f1cc0bd64818>
Date: Wed, 10 Oct 2007 12:09:06 +0000
Subject: don't imply "system/network.h" within replace.h, as this brings in
 the socket_wrapper.h in unexpected code and we endup with a missing
 'swrap_close' while linking

metze

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25602 0c0555d6-39d7-0310-84fc-f1cc0bd64818
(This used to be commit ec8e3f7f92522c65ec472058321db8a7ac30ec4c)
---
 source3/lib/replace/replace.h        | 10 +++++++---
 source3/lib/replace/system/network.h | 12 +++++++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'source3/lib/replace')

diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h
index 3dc10db59f..45902657a2 100644
--- a/source3/lib/replace/replace.h
+++ b/source3/lib/replace/replace.h
@@ -326,15 +326,19 @@ ssize_t rep_pread(int __fd, void *__buf, size_t __nbytes, off_t __offset);
 ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset);
 #endif
 
+#ifdef REPLACE_INET_NTOA
+#define inet_ntoa rep_inet_ntoa
+/* prototype is in "system/network.h" */
+#endif
+
 #ifndef HAVE_INET_PTON
-int rep_inet_pton(int af, const char *src, void *dst);
 #define inet_pton rep_inet_pton
+/* prototype is in "system/network.h" */
 #endif
 
 #ifndef HAVE_INET_NTOP
-#include "system/network.h"
-const char *rep_inet_ntop(int af, const void *src, char *dst, socklen_t size);
 #define inet_ntop rep_inet_ntop
+/* prototype is in "system/network.h" */
 #endif
 
 #ifdef HAVE_LIMITS_H
diff --git a/source3/lib/replace/system/network.h b/source3/lib/replace/system/network.h
index c2a5dec5af..10e9f66bd9 100644
--- a/source3/lib/replace/system/network.h
+++ b/source3/lib/replace/system/network.h
@@ -86,8 +86,18 @@
 #endif
 
 #ifdef REPLACE_INET_NTOA
+/* define is in "replace.h" */
 char *rep_inet_ntoa(struct in_addr ip);
-#define inet_ntoa rep_inet_ntoa
+#endif
+
+#ifndef HAVE_INET_PTON
+/* define is in "replace.h" */
+int rep_inet_pton(int af, const char *src, void *dst);
+#endif
+
+#ifndef HAVE_INET_NTOP
+/* define is in "replace.h" */
+const char *rep_inet_ntop(int af, const void *src, char *dst, socklen_t size);
 #endif
 
 /*
-- 
cgit