The branch, master has been updated
       via  748b5c5d Some configure tweaks for TANDEM.
      from  e1e4ffe0 Some C99 flexible array changes

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 748b5c5d532d8a11d476475766dc5b0e5b0cd970
Author: Wayne Davison <wa...@opencoder.net>
Date:   Sun Jul 5 19:08:44 2020 -0700

    Some configure tweaks for TANDEM.

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

Summary of changes:
 configure.ac | 13 +++++++++++--
 rsync.h      |  2 ++
 2 files changed, 13 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/configure.ac b/configure.ac
index 112367cb..24a07101 100644
--- a/configure.ac
+++ b/configure.ac
@@ -346,7 +346,7 @@ AC_ARG_ENABLE(ipv6,
        AS_HELP_STRING([--disable-ipv6],[turn off IPv6 support]))
 if test x"$enable_ipv6" != x"no"; then
        AC_MSG_CHECKING([ipv6 stack type])
-       for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta 
cygwin; do
+       for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta 
cygwin TANDEM; do
                case $i in
                inria)
                        # http://www.kame.net/
@@ -438,6 +438,15 @@ yes
 #include <netinet/in.h>
 #ifdef _CYGWIN_IN6_H
 yes
+#endif],
+                               [ipv6type=$i;
+                               AC_DEFINE(INET6, 1, [true if you have IPv6])])
+                       ;;
+               TANDEM)
+                       AC_EGREP_CPP(yes, [
+#include <netinet/ip6.h>
+#ifdef __TANDEM
+yes
 #endif],
                                [ipv6type=$i;
                                AC_DEFINE(INET6, 1, [true if you have IPv6])])
@@ -481,7 +490,7 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h 
sys/time.h sys/unistd.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 netinet/in_systm.h netinet/ip.h \
-    zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h)
+    zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h)
 AC_HEADER_MAJOR_FIXED
 
 AC_MSG_CHECKING([whether to enable use of openssl crypto library])
diff --git a/rsync.h b/rsync.h
index 1d6b8179..5983c906 100644
--- a/rsync.h
+++ b/rsync.h
@@ -442,7 +442,9 @@ enum delret {
 #include <netdb.h>
 #endif
 #include <syslog.h>
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
+#endif
 
 #ifdef HAVE_DIRENT_H
 # include <dirent.h>


-- 
The rsync repository.

_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs

Reply via email to