The branch, master has been updated via 0a77ade Fix Minix build errors. Fixes bug 8313. from 0a04a80 Replace another inet_ntop() call with getnameinfo().
;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 0a77adee0b280ab60bcf2bb8d8674708a906d9e2 Author: Wayne Davison <way...@samba.org> Date: Fri Jul 22 11:17:57 2011 -0700 Fix Minix build errors. Fixes bug 8313. ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- socket.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/configure.ac b/configure.ac index dfe3101..b822d09 100644 --- a/configure.ac +++ b/configure.ac @@ -339,7 +339,7 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \ sys/un.h sys/attr.h mcheck.h arpa/inet.h arpa/nameser.h locale.h \ netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h \ sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h \ - popt.h popt/popt.h linux/falloc.h) + popt.h popt/popt.h linux/falloc.h netinet/in_systm.h netinet/ip.h) AC_HEADER_MAJOR AC_CACHE_CHECK([if makedev takes 3 args],rsync_cv_MAKEDEV_TAKES_3_ARGS,[ diff --git a/socket.c b/socket.c index b6f29af..0f596e0 100644 --- a/socket.c +++ b/socket.c @@ -26,8 +26,12 @@ #include "rsync.h" #include "itypes.h" +#ifdef HAVE_NETINET_IN_SYSTM_H #include <netinet/in_systm.h> +#endif +#ifdef HAVE_NETINET_IP_H #include <netinet/ip.h> +#endif #include <netinet/tcp.h> extern char *bind_address; @@ -642,7 +646,9 @@ struct } socket_options[] = { {"SO_KEEPALIVE", SOL_SOCKET, SO_KEEPALIVE, 0, OPT_BOOL}, {"SO_REUSEADDR", SOL_SOCKET, SO_REUSEADDR, 0, OPT_BOOL}, +#ifdef SO_BROADCAST {"SO_BROADCAST", SOL_SOCKET, SO_BROADCAST, 0, OPT_BOOL}, +#endif #ifdef TCP_NODELAY {"TCP_NODELAY", IPPROTO_TCP, TCP_NODELAY, 0, OPT_BOOL}, #endif -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs