svn commit: samba r25719 - in
branches/SAMBA_4_0/source/heimdal_build: .
metze at samba.org
metze at samba.org
Wed Oct 24 13:50:31 GMT 2007
Author: metze
Date: 2007-10-24 13:50:30 +0000 (Wed, 24 Oct 2007)
New Revision: 25719
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25719
Log:
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
Modified:
branches/SAMBA_4_0/source/heimdal_build/roken.h
Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/roken.h
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/roken.h 2007-10-24 13:01:03 UTC (rev 25718)
+++ branches/SAMBA_4_0/source/heimdal_build/roken.h 2007-10-24 13:50:30 UTC (rev 25719)
@@ -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
More information about the samba-cvs
mailing list