summaryrefslogtreecommitdiff
path: root/source3/lib/replace/replace.h
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-10-06 23:07:33 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:31:13 -0500
commitd154a0d74b23b4a1fbd921f17dec3e0e3506eeab (patch)
tree3ed018130022385c08bef59fc5e00339af5b336c /source3/lib/replace/replace.h
parentb92212575d370275bf1609cac6bc13c71de472d4 (diff)
downloadsamba-d154a0d74b23b4a1fbd921f17dec3e0e3506eeab.tar.gz
samba-d154a0d74b23b4a1fbd921f17dec3e0e3506eeab.tar.bz2
samba-d154a0d74b23b4a1fbd921f17dec3e0e3506eeab.zip
r25557: merge libreplace fixes from samba4
(This used to be commit 8c1669997c53f0f7bfb9a794083afd01b131f676)
Diffstat (limited to 'source3/lib/replace/replace.h')
-rw-r--r--source3/lib/replace/replace.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h
index ca4becaa70..26e39ac603 100644
--- a/source3/lib/replace/replace.h
+++ b/source3/lib/replace/replace.h
@@ -330,22 +330,17 @@ 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
-#include "system/network.h"
-
#ifndef HAVE_INET_PTON
int rep_inet_pton(int af, const char *src, void *dst);
#define inet_pton rep_inet_pton
#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
#endif
-#if !defined(HAVE_GETADDRINFO)
-#include "system/getaddrinfo.h"
-#endif
-
#ifdef HAVE_LIMITS_H
#include <limits.h>
#endif