[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. debian/1.14.3-200-gb232f8a

[Clint Adams]

The following commit has been merged in the upstream branch:
commit 10e153a58825d548e792f08ad3bb6ac3607a90db
Author: Clint Adams <schizo at debian.org>
Date:   Fri Jun 18 22:19:43 2004 +0000

    include sys/socket.h for FreeBSD
    
      * configure.ac, communicate.c: include sys/socket.h if available
        (necessary on FreeBSD).
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-2

diff --git a/communicate.c b/communicate.c
index 5aedad7..17e8433 100644
--- a/communicate.c
+++ b/communicate.c
@@ -25,6 +25,9 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdarg.h>
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
 
 #ifndef FAKEROOT_FAKENET
 int msg_snd=-1;
diff --git a/configure.ac b/configure.ac
index 3c6189c..b4d362f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ fi
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h unistd.h features.h sys/feature_tests.h pthread.h stdint.h inttypes.h grp.h endian.h sys/sysmacros.h)
+AC_CHECK_HEADERS(fcntl.h unistd.h features.h sys/feature_tests.h pthread.h stdint.h inttypes.h grp.h endian.h sys/sysmacros.h sys/socket.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
diff --git a/debian/changelog b/debian/changelog
index 3892ca1..6eb4f72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ fakeroot (1.0.3) unstable; urgency=low
 
   * libfakeroot.c: correctly handle platforms where the first
     argument to setgroups() is int.
+  * configure.ac, communicate.c: include sys/socket.h if available
+    (necessary on FreeBSD).
 
  -- Clint Adams <schizo at debian.org>  Fri, 18 Jun 2004 15:42:33 -0400
 

-- 
fakeroot