Skip to content

Commit 0255967

Browse files
committed
Silence autoconf warnings.
1 parent 449d9bf commit 0255967

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

configure.ac

+7-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ AC_INIT([rsync],[ ],[https://rsync.samba.org/bug-tracking.html])
44

55
AC_C_BIGENDIAN
66
AC_HEADER_DIRENT
7-
AC_HEADER_TIME
87
AC_HEADER_SYS_WAIT
98
AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \
109
unistd.h utime.h compat.h sys/param.h ctype.h sys/wait.h sys/stat.h \
@@ -20,7 +19,7 @@ AC_HEADER_MAJOR_FIXED
2019

2120
AC_CONFIG_MACRO_DIR([m4])
2221
AC_CONFIG_SRCDIR([byteorder.h])
23-
AC_CONFIG_HEADER(config.h)
22+
AC_CONFIG_HEADERS([config.h])
2423
AC_PREREQ([2.69])
2524

2625
PACKAGE_VERSION=`sed -n 's/.*RSYNC_VERSION.*"\(.*\)".*/\1/p' <$srcdir/version.h`
@@ -61,7 +60,6 @@ AC_PROG_AWK
6160
AC_PROG_EGREP
6261
AC_PROG_INSTALL
6362
AC_PROG_MKDIR_P
64-
AC_PROG_CC_STDC
6563
AC_SUBST(SHELL)
6664
AC_PATH_PROG([PERL], [perl])
6765
AC_PATH_PROG([PYTHON3], [python3])
@@ -390,7 +388,7 @@ AS_HELP_STRING([--disable-ipv6],[disable to omit ipv6 support]),
390388
;;
391389
esac ],
392390

393-
AC_TRY_RUN([ /* AF_INET6 availability check */
391+
AC_RUN_IFELSE([AC_LANG_SOURCE([[ /* AF_INET6 availability check */
394392
#include <stdlib.h>
395393
#include <sys/types.h>
396394
#include <sys/socket.h>
@@ -401,11 +399,11 @@ main()
401399
else
402400
exit(0);
403401
}
404-
],
405-
AC_MSG_RESULT(yes)
406-
AC_DEFINE(INET6, 1, [true if you have IPv6]),
407-
AC_MSG_RESULT(no),
408-
AC_MSG_RESULT(no)
402+
]])],
403+
[AC_MSG_RESULT(yes)
404+
AC_DEFINE(INET6, 1, true if you have IPv6)],
405+
[AC_MSG_RESULT(no)],
406+
[AC_MSG_RESULT(no)]
409407
))
410408

411409
dnl Do you want to disable use of locale functions

m4/have_type.m4

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
dnl AC_HAVE_TYPE(TYPE,INCLUDES)
22
AC_DEFUN([AC_HAVE_TYPE], [
3-
AC_REQUIRE([AC_HEADER_STDC])
43
cv=`echo "$1" | sed 'y%./+- %__p__%'`
54
AC_MSG_CHECKING(for $1)
65
AC_CACHE_VAL([ac_cv_type_$cv],

rsync.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -366,16 +366,10 @@ enum delret {
366366
#include <sys/socket.h>
367367
#endif
368368

369-
#ifdef TIME_WITH_SYS_TIME
370-
#include <sys/time.h>
371-
#include <time.h>
372-
#else
373369
#ifdef HAVE_SYS_TIME_H
374370
#include <sys/time.h>
375-
#else
376-
#include <time.h>
377-
#endif
378371
#endif
372+
#include <time.h>
379373

380374
#ifdef HAVE_FCNTL_H
381375
#include <fcntl.h>

0 commit comments

Comments
 (0)