[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-273-g082bea6

[Stefan Metzmacher]

The branch, master has been updated
       via  082bea67af9df2390a422a5b2e9d1a042dd95c10 (commit)
      from  3d280639c4652d6cd35577e333bcd46c2517754c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 082bea67af9df2390a422a5b2e9d1a042dd95c10
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Mar 11 08:05:11 2009 +0100

    lib/replace: make sure we include <sys/uio.h> before socket_wrapper.h
    
    This should fix the build on some hosts.
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 lib/replace/libreplace_network.m4 |    1 +
 lib/replace/system/network.h      |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/libreplace_network.m4 b/lib/replace/libreplace_network.m4
index 78fb1ab..1dc1c44 100644
--- a/lib/replace/libreplace_network.m4
+++ b/lib/replace/libreplace_network.m4
@@ -16,6 +16,7 @@ AC_CHECK_HEADERS([netinet/ip.h], [], [],[#ifdef HAVE_NETINET_IN_H
 #endif])
 AC_CHECK_HEADERS(netinet/tcp.h netinet/in_ip.h)
 AC_CHECK_HEADERS(sys/sockio.h sys/un.h)
+AC_CHECK_HEADERS(sys/uio.h)
 
 dnl we need to check that net/if.h really can be used, to cope with hpux
 dnl where including it always fails
diff --git a/lib/replace/system/network.h b/lib/replace/system/network.h
index f135d17..6add99c 100644
--- a/lib/replace/system/network.h
+++ b/lib/replace/system/network.h
@@ -83,6 +83,10 @@
 #include <sys/ioctl.h>
 #endif
 
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+
 #ifdef HAVE_STROPTS_H
 #include <stropts.h>
 #endif


-- 
Samba Shared Repository