summaryrefslogtreecommitdiff
path: root/source4/heimdal_build
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-10-24 13:50:30 +0200
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:43:26 +0100
commit3e1fbf76baee8556e2c46c9a68764dd3d4a2c33a (patch)
treeb6ca5de4c60b498be1f20a59da1158253d41270e /source4/heimdal_build
parent31569f1c881a735ef3db173ef57881540b0c5537 (diff)
downloadsamba-3e1fbf76baee8556e2c46c9a68764dd3d4a2c33a.tar.gz
r25719: let "system/network.h" do the replacements first, then
roken.h.in can do the missing heimdal bits. this removes to redifinition of 'struct addrinfo' on some platforms metze (This used to be commit 317b6494452f6162465000fe71e5c40c260f735a)
Diffstat (limited to 'source4/heimdal_build')
-rw-r--r--source4/heimdal_build/roken.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h
index 192500ce3e0..3edeb2fb2e6 100644
--- a/source4/heimdal_build/roken.h
+++ b/source4/heimdal_build/roken.h
@@ -53,10 +53,6 @@
#define HAVE_VSYSLOG
#endif
-#ifndef HAVE_SOCKLEN_T
-#define HAVE_SOCKLEN_T
-#endif
-
#ifndef HAVE_SSIZE_T
#define HAVE_SSIZE_T
#endif
@@ -79,12 +75,13 @@
#endif
#endif
+#include "system/network.h"
+
/*
* we don't want that roken.h.in includes socket_wrapper
* we include socket_wrapper via "system/network.h"
*/
#undef SOCKET_WRAPPER_REPLACE
#include "heimdal/lib/roken/roken.h.in"
-#include "system/network.h"
#endif