[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  74561d70 Check for netinet/ip.h after including netinet/in.h.
       via  83f73723 A couple "make" tweaks.
       via  8c3de35b Put 0 in parens to silence an Xcode warning.
      from  ec1d5d56 Add `--with-nobody-user=FOO` configure option.

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


- Log -----------------------------------------------------------------
commit 74561d70b5bc83fab100a3a38788ba2348055396
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sun Jan 31 11:11:07 2021 -0800

    Check for netinet/ip.h after including netinet/in.h.

commit 83f7372369f5c884e9abf02f85879288876b28b0
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sun Jan 31 11:10:38 2021 -0800

    A couple "make" tweaks.

commit 8c3de35b0b6c0e362ce7d33fd983dc828051ca12
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sun Jan 31 09:28:34 2021 -0800

    Put 0 in parens to silence an Xcode warning.

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

Summary of changes:
 configure.ac         | 3 ++-
 lib/pool_alloc.c     | 5 ++---
 packaging/smart-make | 2 +-
 prepare-source       | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/configure.ac b/configure.ac
index b81cfe33..af1874e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,8 +12,9 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \
     sys/un.h sys/attr.h arpa/inet.h arpa/nameser.h locale.h sys/types.h \
     netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h mcheck.h \
     sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h dl.h \
-    popt.h popt/popt.h linux/falloc.h netinet/in_systm.h netinet/ip.h \
+    popt.h popt/popt.h linux/falloc.h netinet/in_systm.h \
     zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h)
+AC_CHECK_HEADERS([netinet/ip.h], [], [], [[#include <netinet/in.h>]])
 AC_HEADER_MAJOR_FIXED
 
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/lib/pool_alloc.c b/lib/pool_alloc.c
index f6c6faf6..a1a7245f 100644
--- a/lib/pool_alloc.c
+++ b/lib/pool_alloc.c
@@ -9,8 +9,7 @@ struct alloc_pool
 	size_t			size;		/* extent size		*/
 	size_t			quantum;	/* allocation quantum	*/
 	struct pool_extent	*extents;	/* top extent is "live" */
-	void			(*bomb)();	/* function to call if
-						 * malloc fails		*/
+	void			(*bomb)();	/* called if malloc fails */
 	int			flags;
 
 	/* statistical data */
@@ -49,7 +48,7 @@ pool_create(size_t size, size_t quantum, void (*bomb)(const char*, const char*,
 {
 	struct alloc_pool *pool;
 
-	if ((MINALIGN & (MINALIGN - 1)) != 0) {
+	if ((MINALIGN & (MINALIGN - 1)) != (0)) {
 		if (bomb)
 			(*bomb)("Compiler error: MINALIGN is not a power of 2", __FILE__, __LINE__);
 		return NULL;
diff --git a/packaging/smart-make b/packaging/smart-make
index 6f634d64..25aa1a35 100755
--- a/packaging/smart-make
+++ b/packaging/smart-make
@@ -4,7 +4,7 @@ set -e
 
 export LANG=C
 
-make=`which gmake 2>/dev/null` || make=`which make 2>/dev/null`
+make=`which gmake 2>/dev/null` || make=make
 
 branch=`packaging/prep-auto-dir`
 if test x"$branch" = x; then
diff --git a/prepare-source b/prepare-source
index f5b7b46c..dd0cbd6a 100755
--- a/prepare-source
+++ b/prepare-source
@@ -43,7 +43,8 @@ fi
 for action in "${@}"; do
     case "$action" in
     build|make)
-	make -f "$dir/prepare-source.mak"
+	make=`which gmake 2>/dev/null` || make=make
+	$make -f "$dir/prepare-source.mak"
 	;;
     fetch|fetchgen)
 	if test "$action" = fetchgen; then


-- 
The rsync repository.