summaryrefslogtreecommitdiff
path: root/source4/lib/replace/system
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-26 13:07:55 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-26 13:07:55 +0100
commita999a1fc996234555bd2d8a4a873b39d111c347e (patch)
tree737b0bf68f6a93d6e835676b96b8bb3c606d1c91 /source4/lib/replace/system
parent227df641f680d844c85ea0ed1694e41ed355e262 (diff)
parent901addd4a18a9a166fc3518a7bce70969f884e6f (diff)
downloadsamba-a999a1fc996234555bd2d8a4a873b39d111c347e.tar.gz
samba-a999a1fc996234555bd2d8a4a873b39d111c347e.tar.bz2
samba-a999a1fc996234555bd2d8a4a873b39d111c347e.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
(This used to be commit 4dab354b626a02e9a5f5cac0d374d18e22718e18)
Diffstat (limited to 'source4/lib/replace/system')
-rw-r--r--source4/lib/replace/system/network.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/lib/replace/system/network.h b/source4/lib/replace/system/network.h
index d09e3f71f8..a84b22e5d0 100644
--- a/source4/lib/replace/system/network.h
+++ b/source4/lib/replace/system/network.h
@@ -83,6 +83,11 @@
#include <stropts.h>
#endif
+#ifndef HAVE_SOCKLEN_T
+#define HAVE_SOCKLEN_T
+typedef int socklen_t;
+#endif
+
#ifdef REPLACE_INET_NTOA
/* define is in "replace.h" */
char *rep_inet_ntoa(struct in_addr ip);
@@ -245,11 +250,6 @@ void rep_freeifaddrs(struct ifaddrs *);
#define HOST_NAME_MAX 256
#endif
-#ifndef HAVE_SOCKLEN_T
-#define HAVE_SOCKLEN_T
-typedef int socklen_t;
-#endif
-
#ifndef HAVE_SA_FAMILY_T
#define HAVE_SA_FAMILY_T
typedef unsigned short int sa_family_t;