Module Name: othersrc
Committed By: lukem
Date: Sun Sep 24 04:54:13 UTC 2023
Modified Files:
othersrc/libexec/tnftpd: configure.ac tnftpd.h
Log Message:
configure: remove obsolete macros
Remove macros marked obsolescent in autoconf 2.69 and
warned as obsolete in autoconf 2.71:
AC_HEADER_STDC()
AC_HEADER_TIME()
AC_TYPE_SIGNAL()
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 othersrc/libexec/tnftpd/configure.ac
cvs rdiff -u -r1.41 -r1.42 othersrc/libexec/tnftpd/tnftpd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/libexec/tnftpd/configure.ac
diff -u othersrc/libexec/tnftpd/configure.ac:1.53 othersrc/libexec/tnftpd/configure.ac:1.54
--- othersrc/libexec/tnftpd/configure.ac:1.53 Sun Sep 24 02:07:11 2023
+++ othersrc/libexec/tnftpd/configure.ac Sun Sep 24 04:54:13 2023
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.53 2023/09/24 02:07:11 lukem Exp $
+# $NetBSD: configure.ac,v 1.54 2023/09/24 04:54:13 lukem Exp $
#
# Process this file with autoconf to produce a configure script.
@@ -206,8 +206,6 @@ AC_CHECK_HEADERS([sys/types.h sys/ioctl.
AC_HEADER_DIRENT()
AC_HEADER_RESOLV()
AC_HEADER_STAT()
-AC_HEADER_STDC()
-AC_HEADER_TIME()
AC_HEADER_TIOCGWINSZ()
AC_CHECK_HEADERS([sys/resource.h \
arpa/inet.h arpa/nameser.h arpa/telnet.h err.h \
@@ -249,7 +247,6 @@ AC_TYPE_LONG_LONG_INT()
AC_TYPE_UINT32_T()
AC_TYPE_OFF_T()
AC_TYPE_PID_T()
-AC_TYPE_SIGNAL()
AC_TYPE_SIZE_T()
AC_STRUCT_TM()
AC_CHECK_MEMBERS([struct sockaddr.sa_len, struct sockaddr_in.sin_len,
Index: othersrc/libexec/tnftpd/tnftpd.h
diff -u othersrc/libexec/tnftpd/tnftpd.h:1.41 othersrc/libexec/tnftpd/tnftpd.h:1.42
--- othersrc/libexec/tnftpd/tnftpd.h:1.41 Sat Sep 23 04:45:03 2023
+++ othersrc/libexec/tnftpd/tnftpd.h Sun Sep 24 04:54:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: tnftpd.h,v 1.41 2023/09/23 04:45:03 lukem Exp $ */
+/* $NetBSD: tnftpd.h,v 1.42 2023/09/24 04:54:13 lukem Exp $ */
#define FTPD_VERSION PACKAGE_STRING
@@ -11,11 +11,9 @@
#if defined(HAVE_SYS_TYPES_H)
# include <sys/types.h>
#endif
-#if defined(STDC_HEADERS)
-# include <stdarg.h>
-# include <stdlib.h>
-# include <string.h>
-#endif
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
#if defined(HAVE_UNISTD_H)
# include <unistd.h>
#endif
@@ -154,16 +152,10 @@ struct pollfd {
};
#endif
-#if defined(TIME_WITH_SYS_TIME)
+#if defined(HAVE_SYS_TIME_H)
# include <sys/time.h>
-# include <time.h>
-#else
-# if defined(HAVE_SYS_TIME_H)
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
#endif
+#include <time.h>
#if defined(HAVE_SYS_RESOURCE_H)
# include <sys/resource.h>
