diff options
| author | Florian Obser <florian@cvs.openbsd.org> | 2020-01-22 13:02:11 +0000 |
|---|---|---|
| committer | Florian Obser <florian@cvs.openbsd.org> | 2020-01-22 13:02:11 +0000 |
| commit | 7394ea0cf2bd6a145b4a96e3b25452bdf1fc3d6d (patch) | |
| tree | 0c2ac1fcc72a991ec711fddacedef8060f4180e0 /usr.sbin/bind | |
| parent | f58ba53723b6be0b8d97c69bf66c9d72920b98fa (diff) | |
config.h and platform.h are unused now
Diffstat (limited to 'usr.sbin/bind')
116 files changed, 265 insertions, 692 deletions
diff --git a/usr.sbin/bind/acconfig.h b/usr.sbin/bind/acconfig.h deleted file mode 100644 index f2fc2c80604..00000000000 --- a/usr.sbin/bind/acconfig.h +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* $Id: acconfig.h,v 1.9 2019/12/17 01:46:30 sthen Exp $ */ - -/*! \file */ - -/*** - *** This file is not to be included by any public header files, because - *** it does not get installed. - ***/ -@TOP@ - -/** define on DEC OSF to enable 4.4BSD style sa_len support */ -#undef _SOCKADDR_LEN - -/** define if your system needs pthread_init() before using pthreads */ -#undef NEED_PTHREAD_INIT - -/** define if your system has sigwait() */ -#undef HAVE_SIGWAIT - -/** define if sigwait() is the UnixWare flavor */ -#undef HAVE_UNIXWARE_SIGWAIT - -/** define on Solaris to get sigwait() to work using pthreads semantics */ -#undef _POSIX_PTHREAD_SEMANTICS - -/** define if LinuxThreads is in use */ -#undef HAVE_LINUXTHREADS - -/** define if sysconf() is available */ -#undef HAVE_SYSCONF - -/** define if sysctlbyname() is available */ -#undef HAVE_SYSCTLBYNAME - -/** define if catgets() is available */ -#undef HAVE_CATGETS - -/** define if getifaddrs() exists */ -#undef HAVE_GETIFADDRS - -/** define if you have the NET_RT_IFLIST sysctl variable and sys/sysctl.h */ -#undef HAVE_IFLIST_SYSCTL - -/** define if tzset() is available */ -#undef HAVE_TZSET - -/** define if struct addrinfo exists */ -#undef HAVE_ADDRINFO - -/** define if getaddrinfo() exists */ -#undef HAVE_GETADDRINFO - -/** define if gai_strerror() exists */ -#undef HAVE_GAISTRERROR - -/** - * define if pthread_setconcurrency() should be called to tell the - * OS how many threads we might want to run. - */ -#undef CALL_PTHREAD_SETCONCURRENCY - -/** define if IPv6 is not disabled */ -#undef WANT_IPV6 - -/** define if flockfile() is available */ -#undef HAVE_FLOCKFILE - -/** define if getc_unlocked() is available */ -#undef HAVE_GETCUNLOCKED - -/** Shut up warnings about sputaux in stdio.h on BSD/OS pre-4.1 */ -#undef SHUTUP_SPUTAUX -#ifdef SHUTUP_SPUTAUX -struct __sFILE; -extern __inline int __sputaux(int _c, struct __sFILE *_p); -#endif - -/** Shut up warnings about missing sigwait prototype on BSD/OS 4.0* */ -#undef SHUTUP_SIGWAIT -#ifdef SHUTUP_SIGWAIT -int sigwait(const unsigned int *set, int *sig); -#endif - -/** Shut up warnings from gcc -Wcast-qual on BSD/OS 4.1. */ -#undef SHUTUP_STDARG_CAST -#if defined(SHUTUP_STDARG_CAST) && defined(__GNUC__) -#include <stdarg.h> /** Grr. Must be included *every time*. */ -/** - * The silly continuation line is to keep configure from - * commenting out the #undef. - */ - -#undef \ - va_start -#define va_start(ap, last) \ - do { \ - union { const void *konst; long *var; } _u; \ - _u.konst = &(last); \ - ap = (va_list)(_u.var + __va_words(__typeof(last))); \ - } while (0) -#endif /** SHUTUP_STDARG_CAST && __GNUC__ */ - -/** define if the system has a random number generating device */ -#undef PATH_RANDOMDEV - -/** define if pthread_attr_getstacksize() is available */ -#undef HAVE_PTHREAD_ATTR_GETSTACKSIZE - -/** define if pthread_attr_setstacksize() is available */ -#undef HAVE_PTHREAD_ATTR_SETSTACKSIZE - -/** define if you have strerror in the C library. */ -#undef HAVE_STRERROR - -/* Define if OpenSSL includes DSA support */ -#undef HAVE_OPENSSL_DSA - -/* Define if you have getpassphrase in the C library. */ -#undef HAVE_GETPASSPHRASE - -/* Define to the length type used by the socket API (socklen_t, size_t, int). */ -#undef ISC_SOCKADDR_LEN_T - -/* Define if threads need PTHREAD_SCOPE_SYSTEM */ -#undef NEED_PTHREAD_SCOPE_SYSTEM - -/* Define to 1 if you have the uname library function. */ -#undef HAVE_UNAME diff --git a/usr.sbin/bind/bin/dig/dig.c b/usr.sbin/bind/bin/dig/dig.c index 52413b93692..8cec46f2c3f 100644 --- a/usr.sbin/bind/bin/dig/dig.c +++ b/usr.sbin/bind/bin/dig/dig.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dig.c,v 1.40 2020/01/21 06:59:25 jmc Exp $ */ +/* $Id: dig.c,v 1.41 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ #include <sys/cdefs.h> -#include <config.h> + #include <stdlib.h> #include <time.h> #include <unistd.h> @@ -27,7 +27,7 @@ #include <isc/app.h> #include <isc/netaddr.h> #include <isc/parseint.h> -#include <isc/platform.h> + #include <string.h> #include <isc/task.h> diff --git a/usr.sbin/bind/bin/dig/dighost.c b/usr.sbin/bind/bin/dig/dighost.c index 059391127b3..e3d6f613619 100644 --- a/usr.sbin/bind/bin/dig/dighost.c +++ b/usr.sbin/bind/bin/dig/dighost.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dighost.c,v 1.35 2020/01/22 12:58:35 florian Exp $ */ +/* $Id: dighost.c,v 1.36 2020/01/22 13:02:09 florian Exp $ */ /*! \file * \note @@ -26,7 +26,7 @@ * functions in most applications. */ -#include <config.h> + #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/usr.sbin/bind/bin/dig/host.c b/usr.sbin/bind/bin/dig/host.c index ddeb99e05c7..949a61b17d7 100644 --- a/usr.sbin/bind/bin/dig/host.c +++ b/usr.sbin/bind/bin/dig/host.c @@ -16,7 +16,7 @@ /*! \file */ #include <sys/cdefs.h> -#include <config.h> + #include <stdlib.h> #include <unistd.h> #include <limits.h> diff --git a/usr.sbin/bind/bin/dig/nslookup.c b/usr.sbin/bind/bin/dig/nslookup.c index f5b0d7d1ab9..410be72543d 100644 --- a/usr.sbin/bind/bin/dig/nslookup.c +++ b/usr.sbin/bind/bin/dig/nslookup.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include <config.h> + #include <stdlib.h> #include <unistd.h> diff --git a/usr.sbin/bind/config.h.in b/usr.sbin/bind/config.h.in deleted file mode 100644 index c194517d79c..00000000000 --- a/usr.sbin/bind/config.h.in +++ /dev/null @@ -1,120 +0,0 @@ -/* config.h.in. Generated from configure.in by autoheader. */ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* $Id: config.h.in,v 1.17 2020/01/22 12:57:21 florian Exp $ */ - -/*! \file */ - -/*** - *** This file is not to be included by any public header files, because - *** it does not get installed. - ***/ - -/** define if your system has sigwait() */ -#undef HAVE_SIGWAIT - -/** define if sysctlbyname() is available */ -#undef HAVE_SYSCTLBYNAME - -/** define if IPv6 is not disabled */ -#undef WANT_IPV6 - -/** define if flockfile() is available */ -#undef HAVE_FLOCKFILE - -/** define if getc_unlocked() is available */ -#undef HAVE_GETCUNLOCKED - -/* Define to enable the "filter-aaaa-on-v4" and "filter-aaaa-on-v6" options. - */ -#undef ALLOW_FILTER_AAAA - -/* Define if recvmsg() does not meet all of the BSD socket API specifications. - */ -#undef BROKEN_RECVMSG - -/* Define to enable the "fetches-per-server" and "fetches-per-zone" options. - */ -#undef ENABLE_FETCHLIMIT - -/* Solaris hack to get select_large_fdset. */ -#undef FD_SETSIZE - -/* Define to 1 if you have the `explicit_bzero' function. */ -#undef HAVE_EXPLICIT_BZERO - -/* Define to 1 if you have the `fseeko' function. */ -#undef HAVE_FSEEKO - -/* Define to 1 if you have the `ftello' function. */ -#undef HAVE_FTELLO - -/* Define to 1 if you have the if_nametoindex function. */ -#undef HAVE_IF_NAMETOINDEX - -/* Define to 1 if you have the <inttypes.h> header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the <linux/netlink.h> header file. */ -#undef HAVE_LINUX_NETLINK_H - -/* Define to 1 if you have the <linux/rtnetlink.h> header file. */ -#undef HAVE_LINUX_RTNETLINK_H - -/* Define to 1 if you have the <locale.h> header file. */ -#undef HAVE_LOCALE_H - -/* Define to 1 if you have the `mmap' function. */ -#undef HAVE_MMAP - -/* Define to 1 if you have the <sys/mman.h> header file. */ -#undef HAVE_SYS_MMAN_H - -/* Define to 1 if you have the <sys/param.h> header file. */ -#undef HAVE_SYS_PARAM_H - -/* Define to 1 if you have the <sys/sysctl.h> header file. */ -#undef HAVE_SYS_SYSCTL_H - -/* Defined if extern char *optarg is not declared. */ -#undef NEED_OPTARG - -/* Define if connect does not honour the permission on the UNIX domain socket. - */ -#undef NEED_SECURE_DIRECTORY - -/* Define if GOST private keys are encoded in ASN.1. */ -#undef PREFER_GOSTASN1 - -/* Define to use large-system tuning. */ -#undef TUNE_LARGE - -/* Defined if you need to use ioctl(FIONBIO) instead a fcntl call to make - non-blocking. */ -#undef USE_FIONBIO_IOCTL - -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -# undef WORDS_BIGENDIAN -# endif -#endif diff --git a/usr.sbin/bind/configure b/usr.sbin/bind/configure index 32aafe157ba..59bb851dd26 100644 --- a/usr.sbin/bind/configure +++ b/usr.sbin/bind/configure @@ -2757,8 +2757,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_headers="$ac_config_headers config.h" - ac_aux_dir= @@ -20350,7 +20348,7 @@ DNS_CRYPTO_LIBS="$NEWFLAGS" # elsewhere if there's a good reason for doing so. # -ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/dig/Makefile lib/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/isc/nothreads/Makefile lib/isc/nothreads/include/Makefile lib/isc/nothreads/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/lwres/Makefile" +ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/dig/Makefile lib/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/isc/nothreads/Makefile lib/isc/nothreads/include/Makefile lib/isc/nothreads/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/lwres/Makefile" # @@ -20447,7 +20445,43 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -DEFS=-DHAVE_CONFIG_H +# Transform confdefs.h into DEFS. +# Protect against shell expansion while executing Makefile rules. +# Protect against Makefile macro expansion. +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +ac_script=' +:mline +/\\$/{ + N + s,\\\n,, + b mline +} +t clear +:clear +s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g +t quote +s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g +t quote +b any +:quote +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/\[/\\&/g +s/\]/\\&/g +s/\$/$$/g +H +:any +${ + g + s/^\n// + s/\n/ /g + p +} +' +DEFS=`sed -n "$ac_script" confdefs.h` + ac_libobjs= ac_ltlibobjs= @@ -20882,15 +20916,11 @@ case $ac_config_files in *" "*) set x $ac_config_files; shift; ac_config_files=$*;; esac -case $ac_config_headers in *" -"*) set x $ac_config_headers; shift; ac_config_headers=$*;; -esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" -config_headers="$ac_config_headers" config_commands="$ac_config_commands" _ACEOF @@ -20912,15 +20942,10 @@ Usage: $0 [OPTION]... [TAG]... --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE Configuration files: $config_files -Configuration headers: -$config_headers - Configuration commands: $config_commands @@ -20987,18 +21012,7 @@ do esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append CONFIG_HEADERS " '$ac_optarg'" - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' -Try \`$0 --help' for more information.";; - --help | --hel | -h ) + --he | --h | --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) @@ -21336,7 +21350,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 for ac_config_target in $ac_config_targets do case $ac_config_target in - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "make/rules") CONFIG_FILES="$CONFIG_FILES make/rules" ;; "make/includes") CONFIG_FILES="$CONFIG_FILES make/includes" ;; @@ -21358,7 +21371,6 @@ do "lib/isc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/Makefile" ;; "lib/isc/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/include/Makefile" ;; "lib/isc/include/isc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/include/isc/Makefile" ;; - "lib/isc/include/isc/platform.h") CONFIG_FILES="$CONFIG_FILES lib/isc/include/isc/platform.h" ;; "lib/isc/unix/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/unix/Makefile" ;; "lib/isc/unix/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/unix/include/Makefile" ;; "lib/isc/unix/include/isc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/isc/unix/include/isc/Makefile" ;; @@ -21378,7 +21390,6 @@ done # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi @@ -21601,116 +21612,8 @@ fi cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" -# Set up the scripts for CONFIG_HEADERS section. -# No need to generate them if there are no CONFIG_HEADERS. -# This happens for instance with `./config.status Makefile'. -if test -n "$CONFIG_HEADERS"; then -cat >"$ac_tmp/defines.awk" <<\_ACAWK || -BEGIN { -_ACEOF - -# Transform confdefs.h into an awk script `defines.awk', embedded as -# here-document in config.status, that substitutes the proper values into -# config.h.in to produce config.h. - -# Create a delimiter string that does not exist in confdefs.h, to ease -# handling of long lines. -ac_delim='%!_!# ' -for ac_last_try in false false :; do - ac_tt=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_tt"; then - break - elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -# For the awk script, D is an array of macro values keyed by name, -# likewise P contains macro parameters if any. Preserve backslash -# newline sequences. - -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -sed -n ' -s/.\{148\}/&'"$ac_delim"'/g -t rset -:rset -s/^[ ]*#[ ]*define[ ][ ]*/ / -t def -d -:def -s/\\$// -t bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3"/p -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p -d -:bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3\\\\\\n"\\/p -t cont -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p -t cont -d -:cont -n -s/.\{148\}/&'"$ac_delim"'/g -t clear -:clear -s/\\$// -t bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/"/p -d -:bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p -b cont -' <confdefs.h | sed ' -s/'"$ac_delim"'/"\\\ -"/g' >>$CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - for (key in D) D_is_set[key] = 1 - FS = "" -} -/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { - line = \$ 0 - split(line, arg, " ") - if (arg[1] == "#") { - defundef = arg[2] - mac1 = arg[3] - } else { - defundef = substr(arg[1], 2) - mac1 = arg[2] - } - split(mac1, mac2, "(") #) - macro = mac2[1] - prefix = substr(line, 1, index(line, defundef) - 1) - if (D_is_set[macro]) { - # Preserve the white space surrounding the "#". - print prefix "define", macro P[macro] D[macro] - next - } else { - # Replace #undef with comments. This is necessary, for example, - # in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. - if (defundef == "undef") { - print "/*", prefix defundef, macro, "*/" - next - } - } -} -{ print } -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 -fi # test -n "$CONFIG_HEADERS" - -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +eval set X " :F $CONFIG_FILES :C $CONFIG_COMMANDS" shift for ac_tag do @@ -21928,30 +21831,7 @@ which seems to be undefined. Please make sure it is defined" >&2;} esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - :H) - # - # CONFIG_HEADER - # - if test x"$ac_file" != x-; then - { - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" - } >"$ac_tmp/config.h" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} - else - rm -f "$ac_file" - mv "$ac_tmp/config.h" "$ac_file" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - fi - else - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error $? "could not create -" "$LINENO" 5 - fi - ;; + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} diff --git a/usr.sbin/bind/configure.in b/usr.sbin/bind/configure.in index 3fbb9fff839..4b814230933 100644 --- a/usr.sbin/bind/configure.in +++ b/usr.sbin/bind/configure.in @@ -34,7 +34,6 @@ AC_DIVERT_POP()dnl AC_INIT(BIND, [9.10], [info@isc.org], [], [https://www.isc.org/downloads/BIND/]) AC_PREREQ(2.59) -AC_CONFIG_HEADER(config.h) AC_CONFIG_MACRO_DIR([libtool.m4.dir]) AC_CANONICAL_HOST @@ -4564,7 +4563,6 @@ AC_CONFIG_FILES([ lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile - lib/isc/include/isc/platform.h lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile diff --git a/usr.sbin/bind/lib/dns/byaddr.c b/usr.sbin/bind/lib/dns/byaddr.c index c2c0a2a1116..b1fb1e6d78b 100644 --- a/usr.sbin/bind/lib/dns/byaddr.c +++ b/usr.sbin/bind/lib/dns/byaddr.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: byaddr.c,v 1.12 2020/01/20 18:51:52 florian Exp $ */ +/* $Id: byaddr.c,v 1.13 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <isc/buffer.h> diff --git a/usr.sbin/bind/lib/dns/callbacks.c b/usr.sbin/bind/lib/dns/callbacks.c index 0efa8dc5c24..ba7a256f5cf 100644 --- a/usr.sbin/bind/lib/dns/callbacks.c +++ b/usr.sbin/bind/lib/dns/callbacks.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: callbacks.c,v 1.4 2020/01/09 13:47:12 florian Exp $ */ +/* $Id: callbacks.c,v 1.5 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <isc/util.h> diff --git a/usr.sbin/bind/lib/dns/compress.c b/usr.sbin/bind/lib/dns/compress.c index 730a9c25015..6747d34855f 100644 --- a/usr.sbin/bind/lib/dns/compress.c +++ b/usr.sbin/bind/lib/dns/compress.c @@ -14,13 +14,13 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: compress.c,v 1.7 2020/01/20 18:51:52 florian Exp $ */ +/* $Id: compress.c,v 1.8 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ #define DNS_NAME_USEINLINE 1 -#include <config.h> + #include <stdlib.h> #include <string.h> diff --git a/usr.sbin/bind/lib/dns/dnssec.c b/usr.sbin/bind/lib/dns/dnssec.c index 1fabb3d85d7..917944a2032 100644 --- a/usr.sbin/bind/lib/dns/dnssec.c +++ b/usr.sbin/bind/lib/dns/dnssec.c @@ -15,12 +15,12 @@ */ /* - * $Id: dnssec.c,v 1.14 2020/01/20 18:51:52 florian Exp $ + * $Id: dnssec.c,v 1.15 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stdlib.h> diff --git a/usr.sbin/bind/lib/dns/ds.c b/usr.sbin/bind/lib/dns/ds.c index 50d1cd276e6..ba91c419738 100644 --- a/usr.sbin/bind/lib/dns/ds.c +++ b/usr.sbin/bind/lib/dns/ds.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ds.c,v 1.6 2020/01/22 06:47:14 florian Exp $ */ +/* $Id: ds.c,v 1.7 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <string.h> diff --git a/usr.sbin/bind/lib/dns/dst_api.c b/usr.sbin/bind/lib/dns/dst_api.c index ba465802335..caf80f97cae 100644 --- a/usr.sbin/bind/lib/dns/dst_api.c +++ b/usr.sbin/bind/lib/dns/dst_api.c @@ -33,12 +33,12 @@ /* * Principal Author: Brian Wellington - * $Id: dst_api.c,v 1.18 2020/01/22 06:47:14 florian Exp $ + * $Id: dst_api.c,v 1.19 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stdlib.h> #include <time.h> @@ -51,7 +51,7 @@ #include <isc/lex.h> #include <isc/once.h> -#include <isc/platform.h> + #include <isc/refcount.h> diff --git a/usr.sbin/bind/lib/dns/dst_parse.c b/usr.sbin/bind/lib/dns/dst_parse.c index 5965301a291..a33c0bf90a8 100644 --- a/usr.sbin/bind/lib/dns/dst_parse.c +++ b/usr.sbin/bind/lib/dns/dst_parse.c @@ -33,10 +33,10 @@ /*% * Principal Author: Brian Wellington - * $Id: dst_parse.c,v 1.9 2020/01/20 18:51:52 florian Exp $ + * $Id: dst_parse.c,v 1.10 2020/01/22 13:02:09 florian Exp $ */ -#include <config.h> + #include <isc/base64.h> #include <isc/dir.h> diff --git a/usr.sbin/bind/lib/dns/dst_result.c b/usr.sbin/bind/lib/dns/dst_result.c index 2c6ae42f0c3..c3f3683d4aa 100644 --- a/usr.sbin/bind/lib/dns/dst_result.c +++ b/usr.sbin/bind/lib/dns/dst_result.c @@ -16,10 +16,10 @@ /*% * Principal Author: Brian Wellington - * $Id: dst_result.c,v 1.4 2020/01/20 18:46:57 florian Exp $ + * $Id: dst_result.c,v 1.5 2020/01/22 13:02:09 florian Exp $ */ -#include <config.h> + #include <isc/once.h> #include <isc/util.h> diff --git a/usr.sbin/bind/lib/dns/hmac_link.c b/usr.sbin/bind/lib/dns/hmac_link.c index 2d2bde1b955..fad68975fba 100644 --- a/usr.sbin/bind/lib/dns/hmac_link.c +++ b/usr.sbin/bind/lib/dns/hmac_link.c @@ -33,10 +33,10 @@ /* * Principal Author: Brian Wellington - * $Id: hmac_link.c,v 1.8 2020/01/22 06:47:14 florian Exp $ + * $Id: hmac_link.c,v 1.9 2020/01/22 13:02:09 florian Exp $ */ -#include <config.h> + #include <isc/buffer.h> #include <isc/hmacmd5.h> diff --git a/usr.sbin/bind/lib/dns/key.c b/usr.sbin/bind/lib/dns/key.c index f9e8e6e3441..cf861556224 100644 --- a/usr.sbin/bind/lib/dns/key.c +++ b/usr.sbin/bind/lib/dns/key.c @@ -14,9 +14,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: key.c,v 1.4 2020/01/09 18:17:15 florian Exp $ */ +/* $Id: key.c,v 1.5 2020/01/22 13:02:09 florian Exp $ */ + -#include <config.h> #include <stddef.h> #include <stdlib.h> diff --git a/usr.sbin/bind/lib/dns/keydata.c b/usr.sbin/bind/lib/dns/keydata.c index 684b6b5f175..d04e5a40a4b 100644 --- a/usr.sbin/bind/lib/dns/keydata.c +++ b/usr.sbin/bind/lib/dns/keydata.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: keydata.c,v 1.5 2020/01/20 18:51:52 florian Exp $ */ +/* $Id: keydata.c,v 1.6 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stdlib.h> #include <isc/buffer.h> diff --git a/usr.sbin/bind/lib/dns/lib.c b/usr.sbin/bind/lib/dns/lib.c index 55dd08d1b04..47155a278f2 100644 --- a/usr.sbin/bind/lib/dns/lib.c +++ b/usr.sbin/bind/lib/dns/lib.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lib.c,v 1.9 2020/01/21 23:59:20 tedu Exp $ */ +/* $Id: lib.c,v 1.10 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stddef.h> diff --git a/usr.sbin/bind/lib/dns/log.c b/usr.sbin/bind/lib/dns/log.c index 4d8a7e9b73c..db85be7b2b9 100644 --- a/usr.sbin/bind/lib/dns/log.c +++ b/usr.sbin/bind/lib/dns/log.c @@ -18,7 +18,7 @@ /* Principal Authors: DCL */ -#include <config.h> + #include <isc/util.h> diff --git a/usr.sbin/bind/lib/dns/master.c b/usr.sbin/bind/lib/dns/master.c index 1bfc0bfaef3..25091bb41f1 100644 --- a/usr.sbin/bind/lib/dns/master.c +++ b/usr.sbin/bind/lib/dns/master.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: master.c,v 1.13 2020/01/21 23:59:20 tedu Exp $ */ +/* $Id: master.c,v 1.14 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stdlib.h> #include <isc/event.h> #include <isc/lex.h> diff --git a/usr.sbin/bind/lib/dns/masterdump.c b/usr.sbin/bind/lib/dns/masterdump.c index 199b5dc4df7..0b15dcf05ad 100644 --- a/usr.sbin/bind/lib/dns/masterdump.c +++ b/usr.sbin/bind/lib/dns/masterdump.c @@ -16,7 +16,7 @@ /*! \file */ -#include <config.h> + #include <stdlib.h> diff --git a/usr.sbin/bind/lib/dns/message.c b/usr.sbin/bind/lib/dns/message.c index fd3ebb278ef..d8736903fc3 100644 --- a/usr.sbin/bind/lib/dns/message.c +++ b/usr.sbin/bind/lib/dns/message.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: message.c,v 1.16 2020/01/22 12:58:35 florian Exp $ */ +/* $Id: message.c,v 1.17 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ @@ -22,7 +22,7 @@ *** Imports ***/ -#include <config.h> + #include <ctype.h> #include <stdlib.h> diff --git a/usr.sbin/bind/lib/dns/name.c b/usr.sbin/bind/lib/dns/name.c index 87ce4539366..482cb44a4bf 100644 --- a/usr.sbin/bind/lib/dns/name.c +++ b/usr.sbin/bind/lib/dns/name.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: name.c,v 1.21 2020/01/22 12:57:21 florian Exp $ */ +/* $Id: name.c,v 1.22 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <ctype.h> #include <stdlib.h> diff --git a/usr.sbin/bind/lib/dns/ncache.c b/usr.sbin/bind/lib/dns/ncache.c index 451abad5344..0822c7b35a0 100644 --- a/usr.sbin/bind/lib/dns/ncache.c +++ b/usr.sbin/bind/lib/dns/ncache.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ncache.c,v 1.10 2020/01/20 18:51:52 florian Exp $ */ +/* $Id: ncache.c,v 1.11 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <isc/buffer.h> #include <isc/util.h> diff --git a/usr.sbin/bind/lib/dns/nsec.c b/usr.sbin/bind/lib/dns/nsec.c index b8c0ecdbbcd..35c5c503777 100644 --- a/usr.sbin/bind/lib/dns/nsec.c +++ b/usr.sbin/bind/lib/dns/nsec.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nsec.c,v 1.6 2020/01/20 18:51:52 florian Exp $ */ +/* $Id: nsec.c,v 1.7 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <isc/log.h> #include <string.h> diff --git a/usr.sbin/bind/lib/dns/nsec3.c b/usr.sbin/bind/lib/dns/nsec3.c index e8b0cc72aed..6a70369ac3a 100644 --- a/usr.sbin/bind/lib/dns/nsec3.c +++ b/usr.sbin/bind/lib/dns/nsec3.c @@ -14,9 +14,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nsec3.c,v 1.6 2020/01/20 18:51:52 florian Exp $ */ +/* $Id: nsec3.c,v 1.7 2020/01/22 13:02:09 florian Exp $ */ + -#include <config.h> #include <isc/base32.h> #include <isc/buffer.h> diff --git a/usr.sbin/bind/lib/dns/openssl_link.c b/usr.sbin/bind/lib/dns/openssl_link.c index efe2d30bb21..3e5fec1f43b 100644 --- a/usr.sbin/bind/lib/dns/openssl_link.c +++ b/usr.sbin/bind/lib/dns/openssl_link.c @@ -35,7 +35,7 @@ * Principal Author: Brian Wellington */ -#include <config.h> + #include <stdlib.h> diff --git a/usr.sbin/bind/lib/dns/openssldh_link.c b/usr.sbin/bind/lib/dns/openssldh_link.c index 5a4438e424d..789113c1e41 100644 --- a/usr.sbin/bind/lib/dns/openssldh_link.c +++ b/usr.sbin/bind/lib/dns/openssldh_link.c @@ -33,10 +33,10 @@ /* * Principal Author: Brian Wellington - * $Id: openssldh_link.c,v 1.6 2020/01/09 14:21:27 florian Exp $ + * $Id: openssldh_link.c,v 1.7 2020/01/22 13:02:09 florian Exp $ */ -#include <config.h> + diff --git a/usr.sbin/bind/lib/dns/openssldsa_link.c b/usr.sbin/bind/lib/dns/openssldsa_link.c index 8111760d20a..6e9086ebb57 100644 --- a/usr.sbin/bind/lib/dns/openssldsa_link.c +++ b/usr.sbin/bind/lib/dns/openssldsa_link.c @@ -31,7 +31,7 @@ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <config.h> + diff --git a/usr.sbin/bind/lib/dns/opensslecdsa_link.c b/usr.sbin/bind/lib/dns/opensslecdsa_link.c index 9c0e345eb5f..acbe57cf143 100644 --- a/usr.sbin/bind/lib/dns/opensslecdsa_link.c +++ b/usr.sbin/bind/lib/dns/opensslecdsa_link.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include <config.h> + diff --git a/usr.sbin/bind/lib/dns/opensslrsa_link.c b/usr.sbin/bind/lib/dns/opensslrsa_link.c index 9ab61a0993c..3bc8daa9d78 100644 --- a/usr.sbin/bind/lib/dns/opensslrsa_link.c +++ b/usr.sbin/bind/lib/dns/opensslrsa_link.c @@ -17,7 +17,7 @@ /* * Principal Author: Brian Wellington */ -#include <config.h> + diff --git a/usr.sbin/bind/lib/dns/rcode.c b/usr.sbin/bind/lib/dns/rcode.c index 905ca3dcea6..107a44894b7 100644 --- a/usr.sbin/bind/lib/dns/rcode.c +++ b/usr.sbin/bind/lib/dns/rcode.c @@ -14,9 +14,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rcode.c,v 1.10 2020/01/20 18:49:45 florian Exp $ */ +/* $Id: rcode.c,v 1.11 2020/01/22 13:02:09 florian Exp $ */ + -#include <config.h> #include <ctype.h> #include <limits.h> #include <stdlib.h> diff --git a/usr.sbin/bind/lib/dns/rdata.c b/usr.sbin/bind/lib/dns/rdata.c index d56c8baa19b..bdfa34be6ae 100644 --- a/usr.sbin/bind/lib/dns/rdata.c +++ b/usr.sbin/bind/lib/dns/rdata.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rdata.c,v 1.18 2020/01/20 18:51:52 florian Exp $ */ +/* $Id: rdata.c,v 1.19 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <ctype.h> #include <stdlib.h> diff --git a/usr.sbin/bind/lib/dns/rdatalist.c b/usr.sbin/bind/lib/dns/rdatalist.c index 081c7455dd6..b29b795a92f 100644 --- a/usr.sbin/bind/lib/dns/rdatalist.c +++ b/usr.sbin/bind/lib/dns/rdatalist.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rdatalist.c,v 1.6 2019/12/17 01:46:32 sthen Exp $ */ +/* $Id: rdatalist.c,v 1.7 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stddef.h> diff --git a/usr.sbin/bind/lib/dns/rdataset.c b/usr.sbin/bind/lib/dns/rdataset.c index b02fed79a8c..63727fa8b57 100644 --- a/usr.sbin/bind/lib/dns/rdataset.c +++ b/usr.sbin/bind/lib/dns/rdataset.c @@ -16,7 +16,7 @@ /*! \file */ -#include <config.h> + #include <stdint.h> #include <stdlib.h> diff --git a/usr.sbin/bind/lib/dns/result.c b/usr.sbin/bind/lib/dns/result.c index 8c9d5ae6851..f9cb6ef5dcd 100644 --- a/usr.sbin/bind/lib/dns/result.c +++ b/usr.sbin/bind/lib/dns/result.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: result.c,v 1.7 2020/01/20 18:46:57 florian Exp $ */ +/* $Id: result.c,v 1.8 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <isc/once.h> #include <isc/util.h> diff --git a/usr.sbin/bind/lib/dns/soa.c b/usr.sbin/bind/lib/dns/soa.c index 6137f78c5c8..93bd81e7bb6 100644 --- a/usr.sbin/bind/lib/dns/soa.c +++ b/usr.sbin/bind/lib/dns/soa.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: soa.c,v 1.5 2020/01/20 18:51:52 florian Exp $ */ +/* $Id: soa.c,v 1.6 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <string.h> #include <isc/buffer.h> diff --git a/usr.sbin/bind/lib/dns/time.c b/usr.sbin/bind/lib/dns/time.c index 895c72f7777..a31d25999cc 100644 --- a/usr.sbin/bind/lib/dns/time.c +++ b/usr.sbin/bind/lib/dns/time.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: time.c,v 1.10 2020/01/20 18:49:45 florian Exp $ */ +/* $Id: time.c,v 1.11 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stdio.h> #include <string.h> /* Required for HP/UX (and others?) */ diff --git a/usr.sbin/bind/lib/dns/tsec.c b/usr.sbin/bind/lib/dns/tsec.c index 4e621fc47aa..bd28de654dc 100644 --- a/usr.sbin/bind/lib/dns/tsec.c +++ b/usr.sbin/bind/lib/dns/tsec.c @@ -14,9 +14,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: tsec.c,v 1.5 2020/01/20 18:51:52 florian Exp $ */ +/* $Id: tsec.c,v 1.6 2020/01/22 13:02:09 florian Exp $ */ + -#include <config.h> #include <stdlib.h> #include <isc/util.h> diff --git a/usr.sbin/bind/lib/dns/tsig.c b/usr.sbin/bind/lib/dns/tsig.c index 7209b28ee7a..a32cf9bd3f0 100644 --- a/usr.sbin/bind/lib/dns/tsig.c +++ b/usr.sbin/bind/lib/dns/tsig.c @@ -15,10 +15,10 @@ */ /* - * $Id: tsig.c,v 1.16 2020/01/20 18:51:52 florian Exp $ + * $Id: tsig.c,v 1.17 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stdlib.h> #include <isc/buffer.h> diff --git a/usr.sbin/bind/lib/dns/ttl.c b/usr.sbin/bind/lib/dns/ttl.c index 9b732adcd1b..39236071bba 100644 --- a/usr.sbin/bind/lib/dns/ttl.c +++ b/usr.sbin/bind/lib/dns/ttl.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ttl.c,v 1.11 2020/01/20 18:49:45 florian Exp $ */ +/* $Id: ttl.c,v 1.12 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <ctype.h> #include <errno.h> diff --git a/usr.sbin/bind/lib/isc/aes.c b/usr.sbin/bind/lib/isc/aes.c index 03fd326e5ef..fcb9cf1cca9 100644 --- a/usr.sbin/bind/lib/isc/aes.c +++ b/usr.sbin/bind/lib/isc/aes.c @@ -14,15 +14,15 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: aes.c,v 1.7 2020/01/22 06:47:15 florian Exp $ */ +/* $Id: aes.c,v 1.8 2020/01/22 13:02:09 florian Exp $ */ /*! \file isc/aes.c */ -#include "config.h" + #include <isc/assertions.h> #include <isc/aes.h> -#include <isc/platform.h> + #include <string.h> #include <isc/types.h> #include <isc/util.h> diff --git a/usr.sbin/bind/lib/isc/app_api.c b/usr.sbin/bind/lib/isc/app_api.c index 20e5d107523..0d098b64a92 100644 --- a/usr.sbin/bind/lib/isc/app_api.c +++ b/usr.sbin/bind/lib/isc/app_api.c @@ -14,9 +14,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: app_api.c,v 1.5 2020/01/21 23:59:20 tedu Exp $ */ +/* $Id: app_api.c,v 1.6 2020/01/22 13:02:09 florian Exp $ */ + -#include <config.h> #include <unistd.h> diff --git a/usr.sbin/bind/lib/isc/assertions.c b/usr.sbin/bind/lib/isc/assertions.c index 9c787db705e..f8d7130bdd7 100644 --- a/usr.sbin/bind/lib/isc/assertions.c +++ b/usr.sbin/bind/lib/isc/assertions.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: assertions.c,v 1.6 2020/01/20 18:46:57 florian Exp $ */ +/* $Id: assertions.c,v 1.7 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stdio.h> #include <stdlib.h> diff --git a/usr.sbin/bind/lib/isc/base32.c b/usr.sbin/bind/lib/isc/base32.c index c38b01fcf54..162315c0d72 100644 --- a/usr.sbin/bind/lib/isc/base32.c +++ b/usr.sbin/bind/lib/isc/base32.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: base32.c,v 1.4 2020/01/20 18:49:45 florian Exp $ */ +/* $Id: base32.c,v 1.5 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <isc/base32.h> #include <isc/buffer.h> diff --git a/usr.sbin/bind/lib/isc/base64.c b/usr.sbin/bind/lib/isc/base64.c index 5e9ef296bbf..f0564bc737c 100644 --- a/usr.sbin/bind/lib/isc/base64.c +++ b/usr.sbin/bind/lib/isc/base64.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: base64.c,v 1.7 2020/01/20 18:49:45 florian Exp $ */ +/* $Id: base64.c,v 1.8 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <isc/base64.h> #include <isc/buffer.h> diff --git a/usr.sbin/bind/lib/isc/bitstring.c b/usr.sbin/bind/lib/isc/bitstring.c index 2b078656abe..d456a12894e 100644 --- a/usr.sbin/bind/lib/isc/bitstring.c +++ b/usr.sbin/bind/lib/isc/bitstring.c @@ -1,23 +1,25 @@ /* + * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM - * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL - * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING - * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION - * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. */ -/* $ISC: bitstring.c,v 1.12 2001/06/04 19:33:20 tale Exp $ */ +/* $ISC: bitstring.c,v 1.13.18.2 2005/04/29 00:16:44 marka Exp $ */ + +/*! \file */ + -#include <config.h> #include <stddef.h> diff --git a/usr.sbin/bind/lib/isc/buffer.c b/usr.sbin/bind/lib/isc/buffer.c index 86736651e2a..4eea26a098e 100644 --- a/usr.sbin/bind/lib/isc/buffer.c +++ b/usr.sbin/bind/lib/isc/buffer.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: buffer.c,v 1.6 2020/01/20 18:51:53 florian Exp $ */ +/* $Id: buffer.c,v 1.7 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stdlib.h> #include <isc/buffer.h> diff --git a/usr.sbin/bind/lib/isc/bufferlist.c b/usr.sbin/bind/lib/isc/bufferlist.c index 024d12a9474..a1566ad0c53 100644 --- a/usr.sbin/bind/lib/isc/bufferlist.c +++ b/usr.sbin/bind/lib/isc/bufferlist.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: bufferlist.c,v 1.3 2019/12/17 01:46:34 sthen Exp $ */ +/* $Id: bufferlist.c,v 1.4 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stddef.h> diff --git a/usr.sbin/bind/lib/isc/commandline.c b/usr.sbin/bind/lib/isc/commandline.c index c97d6afb39c..d7ae27990f3 100644 --- a/usr.sbin/bind/lib/isc/commandline.c +++ b/usr.sbin/bind/lib/isc/commandline.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. */ -/* $Id: commandline.c,v 1.11 2020/01/20 18:49:45 florian Exp $ */ +/* $Id: commandline.c,v 1.12 2020/01/22 13:02:09 florian Exp $ */ /*! \file * This file was adapted from the NetBSD project's source tree, RCS ID: @@ -58,7 +58,7 @@ * \author Principal ISC caretaker: DCL */ -#include <config.h> + #include <stdio.h> diff --git a/usr.sbin/bind/lib/isc/error.c b/usr.sbin/bind/lib/isc/error.c index 5149767e846..cc4535002ff 100644 --- a/usr.sbin/bind/lib/isc/error.c +++ b/usr.sbin/bind/lib/isc/error.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: error.c,v 1.5 2020/01/20 18:46:57 florian Exp $ */ +/* $Id: error.c,v 1.6 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stdio.h> #include <stdlib.h> diff --git a/usr.sbin/bind/lib/isc/event.c b/usr.sbin/bind/lib/isc/event.c index 385e4cc522b..6c29c5ebb1a 100644 --- a/usr.sbin/bind/lib/isc/event.c +++ b/usr.sbin/bind/lib/isc/event.c @@ -14,14 +14,14 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: event.c,v 1.4 2020/01/20 18:51:53 florian Exp $ */ +/* $Id: event.c,v 1.5 2020/01/22 13:02:09 florian Exp $ */ /*! * \file * \author Principal Author: Bob Halley */ -#include <config.h> + #include <stdlib.h> #include <isc/event.h> diff --git a/usr.sbin/bind/lib/isc/hash.c b/usr.sbin/bind/lib/isc/hash.c index 33224ecd4de..379a29fcbe8 100644 --- a/usr.sbin/bind/lib/isc/hash.c +++ b/usr.sbin/bind/lib/isc/hash.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: hash.c,v 1.12 2020/01/22 12:57:21 florian Exp $ */ +/* $Id: hash.c,v 1.13 2020/01/22 13:02:09 florian Exp $ */ /*! \file * Some portion of this code was derived from universal hash function @@ -55,7 +55,7 @@ or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage. */ -#include <config.h> + #include <stdlib.h> #include <isc/hash.h> diff --git a/usr.sbin/bind/lib/isc/heap.c b/usr.sbin/bind/lib/isc/heap.c index 05582ca5727..19e9b3d64a9 100644 --- a/usr.sbin/bind/lib/isc/heap.c +++ b/usr.sbin/bind/lib/isc/heap.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: heap.c,v 1.5 2020/01/20 18:51:53 florian Exp $ */ +/* $Id: heap.c,v 1.6 2020/01/22 13:02:09 florian Exp $ */ /*! \file * Heap implementation of priority queues adapted from the following: @@ -26,7 +26,7 @@ * ISBN 0-201-06673-4, chapter 11. */ -#include <config.h> + #include <stdlib.h> #include <isc/heap.h> #include <isc/magic.h> diff --git a/usr.sbin/bind/lib/isc/hex.c b/usr.sbin/bind/lib/isc/hex.c index 2305ee5fc4b..4e8c5c4671b 100644 --- a/usr.sbin/bind/lib/isc/hex.c +++ b/usr.sbin/bind/lib/isc/hex.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: hex.c,v 1.4 2020/01/20 18:49:46 florian Exp $ */ +/* $Id: hex.c,v 1.5 2020/01/22 13:02:09 florian Exp $ */ /*! \file */ -#include <config.h> + #include <ctype.h> diff --git a/usr.sbin/bind/lib/isc/hmacmd5.c b/usr.sbin/bind/lib/isc/hmacmd5.c index 4503df07b22..6420671b8cd 100644 --- a/usr.sbin/bind/lib/isc/hmacmd5.c +++ b/usr.sbin/bind/lib/isc/hmacmd5.c @@ -14,14 +14,14 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: hmacmd5.c,v 1.5 2020/01/09 13:52:23 florian Exp $ */ +/* $Id: hmacmd5.c,v 1.6 2020/01/22 13:02:09 florian Exp $ */ /*! \file * This code implements the HMAC-MD5 keyed hash algorithm * described in RFC2104. */ -#include "config.h" + diff --git a/usr.sbin/bind/lib/isc/hmacsha.c b/usr.sbin/bind/lib/isc/hmacsha.c index 699a953c3e6..cd1a0ee6d08 100644 --- a/usr.sbin/bind/lib/isc/hmacsha.c +++ b/usr.sbin/bind/lib/isc/hmacsha.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: hmacsha.c,v 1.8 2020/01/22 06:47:15 florian Exp $ */ +/* $Id: hmacsha.c,v 1.9 2020/01/22 13:02:09 florian Exp $ */ /* * This code implements the HMAC-SHA1, HMAC-SHA224, HMAC-SHA256, HMAC-SHA384 @@ -22,11 +22,11 @@ * draft-ietf-dnsext-tsig-sha-01.txt. */ -#include "config.h" + #include <isc/assertions.h> #include <isc/hmacsha.h> -#include <isc/platform.h> + #include <isc/safe.h> #include <isc/sha1.h> #include <isc/sha2.h> diff --git a/usr.sbin/bind/lib/isc/include/isc/Makefile.in b/usr.sbin/bind/lib/isc/include/isc/Makefile.in index 41b1645a497..21d375bca2c 100644 --- a/usr.sbin/bind/lib/isc/include/isc/Makefile.in +++ b/usr.sbin/bind/lib/isc/include/isc/Makefile.in @@ -51,13 +51,8 @@ install:: installdirs for i in ${HEADERS}; do \ ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/isc ; \ done - ${INSTALL_DATA} platform.h ${DESTDIR}${includedir}/isc uninstall:: - rm -f ${DESTDIR}${includedir}/isc/platform.h for i in ${HEADERS}; do \ rm -f ${DESTDIR}${includedir}/isc/$$i ; \ done - -distclean:: - rm -f platform.h diff --git a/usr.sbin/bind/lib/isc/include/isc/aes.h b/usr.sbin/bind/lib/isc/include/isc/aes.h index 6151c842693..0e31654dd96 100644 --- a/usr.sbin/bind/lib/isc/include/isc/aes.h +++ b/usr.sbin/bind/lib/isc/include/isc/aes.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: aes.h,v 1.3 2020/01/09 14:18:30 florian Exp $ */ +/* $Id: aes.h,v 1.4 2020/01/22 13:02:10 florian Exp $ */ /*! \file isc/aes.h */ @@ -22,7 +22,7 @@ #define ISC_AES_H 1 #include <isc/lang.h> -#include <isc/platform.h> + #include <isc/types.h> #define ISC_AES128_KEYLENGTH 16U diff --git a/usr.sbin/bind/lib/isc/include/isc/assertions.h b/usr.sbin/bind/lib/isc/include/isc/assertions.h index de8c788e2ae..8bf56344e52 100644 --- a/usr.sbin/bind/lib/isc/include/isc/assertions.h +++ b/usr.sbin/bind/lib/isc/include/isc/assertions.h @@ -15,7 +15,7 @@ */ /* - * $Id: assertions.h,v 1.5 2020/01/22 12:57:21 florian Exp $ + * $Id: assertions.h,v 1.6 2020/01/22 13:02:10 florian Exp $ */ /*! \file isc/assertions.h */ @@ -27,7 +27,7 @@ #include <isc/lang.h> -#include <isc/platform.h> + ISC_LANG_BEGINDECLS diff --git a/usr.sbin/bind/lib/isc/include/isc/bind9.h b/usr.sbin/bind/lib/isc/include/isc/bind9.h index 00766cf59b8..b7a2d458d85 100644 --- a/usr.sbin/bind/lib/isc/include/isc/bind9.h +++ b/usr.sbin/bind/lib/isc/include/isc/bind9.h @@ -14,13 +14,13 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: bind9.h,v 1.3 2020/01/09 14:18:30 florian Exp $ */ +/* $Id: bind9.h,v 1.4 2020/01/22 13:02:10 florian Exp $ */ #ifndef ISC_BIND9_H #define ISC_BIND9_H 1 #include <isc/boolean.h> -#include <isc/platform.h> + /* * This determines whether we are using the libisc/libdns libraries diff --git a/usr.sbin/bind/lib/isc/include/isc/commandline.h b/usr.sbin/bind/lib/isc/include/isc/commandline.h index b07431beb49..4a2fba016a7 100644 --- a/usr.sbin/bind/lib/isc/include/isc/commandline.h +++ b/usr.sbin/bind/lib/isc/include/isc/commandline.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: commandline.h,v 1.4 2020/01/09 14:18:30 florian Exp $ */ +/* $Id: commandline.h,v 1.5 2020/01/22 13:02:10 florian Exp $ */ #ifndef ISC_COMMANDLINE_H #define ISC_COMMANDLINE_H 1 @@ -23,7 +23,7 @@ #include <isc/boolean.h> #include <isc/lang.h> -#include <isc/platform.h> + /*% Index into parent argv vector. */ extern int isc_commandline_index; diff --git a/usr.sbin/bind/lib/isc/include/isc/error.h b/usr.sbin/bind/lib/isc/include/isc/error.h index 4ed45c17233..e4fe719f90f 100644 --- a/usr.sbin/bind/lib/isc/include/isc/error.h +++ b/usr.sbin/bind/lib/isc/include/isc/error.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: error.h,v 1.5 2020/01/22 12:57:22 florian Exp $ */ +/* $Id: error.h,v 1.6 2020/01/22 13:02:10 florian Exp $ */ #ifndef ISC_ERROR_H #define ISC_ERROR_H 1 @@ -27,7 +27,7 @@ #include <isc/formatcheck.h> #include <isc/lang.h> -#include <isc/platform.h> + ISC_LANG_BEGINDECLS diff --git a/usr.sbin/bind/lib/isc/include/isc/hmacsha.h b/usr.sbin/bind/lib/isc/include/isc/hmacsha.h index f17ff0e12e3..99243899e98 100644 --- a/usr.sbin/bind/lib/isc/include/isc/hmacsha.h +++ b/usr.sbin/bind/lib/isc/include/isc/hmacsha.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: hmacsha.h,v 1.6 2020/01/22 06:47:15 florian Exp $ */ +/* $Id: hmacsha.h,v 1.7 2020/01/22 13:02:10 florian Exp $ */ /*! \file isc/hmacsha.h * This is the header file for the HMAC-SHA1, HMAC-SHA224, HMAC-SHA256, @@ -25,7 +25,7 @@ #define ISC_HMACSHA_H 1 #include <isc/lang.h> -#include <isc/platform.h> + #include <isc/sha1.h> #include <isc/sha2.h> #include <isc/types.h> diff --git a/usr.sbin/bind/lib/isc/include/isc/ipv6.h b/usr.sbin/bind/lib/isc/include/isc/ipv6.h index 214b2b3079e..69e03f33a07 100644 --- a/usr.sbin/bind/lib/isc/include/isc/ipv6.h +++ b/usr.sbin/bind/lib/isc/include/isc/ipv6.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ipv6.h,v 1.6 2020/01/09 18:17:19 florian Exp $ */ +/* $Id: ipv6.h,v 1.7 2020/01/22 13:02:10 florian Exp $ */ #ifndef ISC_IPV6_H #define ISC_IPV6_H 1 @@ -53,7 +53,7 @@ ***/ -#include <isc/platform.h> + /*** *** Types. diff --git a/usr.sbin/bind/lib/isc/include/isc/log.h b/usr.sbin/bind/lib/isc/include/isc/log.h index 270fab6853f..918e5566632 100644 --- a/usr.sbin/bind/lib/isc/include/isc/log.h +++ b/usr.sbin/bind/lib/isc/include/isc/log.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: log.h,v 1.9 2020/01/20 18:51:53 florian Exp $ */ +/* $Id: log.h,v 1.10 2020/01/22 13:02:10 florian Exp $ */ #ifndef ISC_LOG_H #define ISC_LOG_H 1 @@ -27,7 +27,7 @@ #include <isc/formatcheck.h> #include <isc/lang.h> -#include <isc/platform.h> + #include <isc/types.h> /*@{*/ diff --git a/usr.sbin/bind/lib/isc/include/isc/platform.h.in b/usr.sbin/bind/lib/isc/include/isc/platform.h.in deleted file mode 100644 index 040a57cbf20..00000000000 --- a/usr.sbin/bind/lib/isc/include/isc/platform.h.in +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef ISC_PLATFORM_H -#define ISC_PLATFORM_H 1 - -/*! \file */ - -/***** - ***** Platform-dependent defines. - *****/ - -/*** - *** Miscellaneous. - ***/ - -/* - * Tell emacs to use C mode for this file. - * - * Local Variables: - * mode: c - * End: - */ - -#endif /* ISC_PLATFORM_H */ diff --git a/usr.sbin/bind/lib/isc/include/isc/refcount.h b/usr.sbin/bind/lib/isc/include/isc/refcount.h index 68eecc63dd8..4dd867c4f50 100644 --- a/usr.sbin/bind/lib/isc/include/isc/refcount.h +++ b/usr.sbin/bind/lib/isc/include/isc/refcount.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: refcount.h,v 1.9 2020/01/21 23:59:20 tedu Exp $ */ +/* $Id: refcount.h,v 1.10 2020/01/22 13:02:10 florian Exp $ */ #ifndef ISC_REFCOUNT_H #define ISC_REFCOUNT_H 1 @@ -23,7 +23,7 @@ #include <isc/error.h> #include <isc/lang.h> -#include <isc/platform.h> + #include <isc/types.h> /*! \file isc/refcount.h diff --git a/usr.sbin/bind/lib/isc/include/isc/rwlock.h b/usr.sbin/bind/lib/isc/include/isc/rwlock.h index 3640da9d648..da0bdb9418f 100644 --- a/usr.sbin/bind/lib/isc/include/isc/rwlock.h +++ b/usr.sbin/bind/lib/isc/include/isc/rwlock.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rwlock.h,v 1.8 2020/01/09 18:14:48 florian Exp $ */ +/* $Id: rwlock.h,v 1.9 2020/01/22 13:02:10 florian Exp $ */ #ifndef ISC_RWLOCK_H #define ISC_RWLOCK_H 1 @@ -23,7 +23,7 @@ #include <isc/condition.h> #include <isc/lang.h> -#include <isc/platform.h> + #include <isc/types.h> ISC_LANG_BEGINDECLS diff --git a/usr.sbin/bind/lib/isc/include/isc/sha1.h b/usr.sbin/bind/lib/isc/include/isc/sha1.h index 3abb6e2268d..f5149cc8d3e 100644 --- a/usr.sbin/bind/lib/isc/include/isc/sha1.h +++ b/usr.sbin/bind/lib/isc/include/isc/sha1.h @@ -17,7 +17,7 @@ #ifndef ISC_SHA1_H #define ISC_SHA1_H 1 -/* $Id: sha1.h,v 1.7 2020/01/22 06:47:15 florian Exp $ */ +/* $Id: sha1.h,v 1.8 2020/01/22 13:02:10 florian Exp $ */ /* $NetBSD: sha1.h,v 1.2 1998/05/29 22:55:44 thorpej Exp $ */ @@ -28,7 +28,7 @@ */ #include <isc/lang.h> -#include <isc/platform.h> + #include <isc/types.h> #define ISC_SHA1_DIGESTLENGTH 20U diff --git a/usr.sbin/bind/lib/isc/include/isc/sha2.h b/usr.sbin/bind/lib/isc/include/isc/sha2.h index 1d85c19b096..e87f57d866d 100644 --- a/usr.sbin/bind/lib/isc/include/isc/sha2.h +++ b/usr.sbin/bind/lib/isc/include/isc/sha2.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sha2.h,v 1.7 2020/01/22 06:47:15 florian Exp $ */ +/* $Id: sha2.h,v 1.8 2020/01/22 13:02:10 florian Exp $ */ /* $FreeBSD: src/sys/crypto/sha2/sha2.h,v 1.1.2.1 2001/07/03 11:01:36 ume Exp $ */ /* $KAME: sha2.h,v 1.3 2001/03/12 08:27:48 itojun Exp $ */ @@ -58,7 +58,7 @@ #define ISC_SHA2_H #include <isc/lang.h> -#include <isc/platform.h> + #include <isc/types.h> /*** SHA-224/256/384/512 Various Length Definitions ***********************/ diff --git a/usr.sbin/bind/lib/isc/inet_aton.c b/usr.sbin/bind/lib/isc/inet_aton.c index 6e9d37e56fa..9037fb34ea2 100644 --- a/usr.sbin/bind/lib/isc/inet_aton.c +++ b/usr.sbin/bind/lib/isc/inet_aton.c @@ -66,10 +66,10 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93"; -static char rcsid[] = "$Id: inet_aton.c,v 1.8 2020/01/09 18:17:19 florian Exp $"; +static char rcsid[] = "$Id: inet_aton.c,v 1.9 2020/01/22 13:02:10 florian Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <config.h> + #include <ctype.h> #include <stddef.h> /* Required for NULL. */ diff --git a/usr.sbin/bind/lib/isc/iterated_hash.c b/usr.sbin/bind/lib/isc/iterated_hash.c index 242dc647cb9..2cfa151b4e7 100644 --- a/usr.sbin/bind/lib/isc/iterated_hash.c +++ b/usr.sbin/bind/lib/isc/iterated_hash.c @@ -14,9 +14,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: iterated_hash.c,v 1.2 2019/12/17 01:46:34 sthen Exp $ */ +/* $Id: iterated_hash.c,v 1.3 2020/01/22 13:02:10 florian Exp $ */ + -#include "config.h" #include <stdio.h> diff --git a/usr.sbin/bind/lib/isc/lex.c b/usr.sbin/bind/lib/isc/lex.c index 64096150559..4e478b2890f 100644 --- a/usr.sbin/bind/lib/isc/lex.c +++ b/usr.sbin/bind/lib/isc/lex.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lex.c,v 1.14 2020/01/22 12:58:35 florian Exp $ */ +/* $Id: lex.c,v 1.15 2020/01/22 13:02:10 florian Exp $ */ /*! \file */ -#include <config.h> + #include <ctype.h> #include <errno.h> diff --git a/usr.sbin/bind/lib/isc/log.c b/usr.sbin/bind/lib/isc/log.c index bacf4d37d46..d2e8b6b2ed2 100644 --- a/usr.sbin/bind/lib/isc/log.c +++ b/usr.sbin/bind/lib/isc/log.c @@ -14,12 +14,12 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: log.c,v 1.19 2020/01/21 23:59:20 tedu Exp $ */ +/* $Id: log.c,v 1.20 2020/01/22 13:02:10 florian Exp $ */ /*! \file * \author Principal Authors: DCL */ -#include <config.h> + #include <errno.h> #include <stdlib.h> #include <limits.h> diff --git a/usr.sbin/bind/lib/isc/md5.c b/usr.sbin/bind/lib/isc/md5.c index ca2cb600d26..13061bc95c9 100644 --- a/usr.sbin/bind/lib/isc/md5.c +++ b/usr.sbin/bind/lib/isc/md5.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: md5.c,v 1.5 2020/01/09 13:52:23 florian Exp $ */ +/* $Id: md5.c,v 1.6 2020/01/22 13:02:10 florian Exp $ */ /*! \file * This code implements the MD5 message-digest algorithm. @@ -33,7 +33,7 @@ * will fill a supplied 16-byte array with the digest. */ -#include "config.h" + diff --git a/usr.sbin/bind/lib/isc/netaddr.c b/usr.sbin/bind/lib/isc/netaddr.c index 9c49d6c0507..0e00abeb3b5 100644 --- a/usr.sbin/bind/lib/isc/netaddr.c +++ b/usr.sbin/bind/lib/isc/netaddr.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: netaddr.c,v 1.10 2020/01/20 18:49:46 florian Exp $ */ +/* $Id: netaddr.c,v 1.11 2020/01/22 13:02:10 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stdio.h> diff --git a/usr.sbin/bind/lib/isc/netscope.c b/usr.sbin/bind/lib/isc/netscope.c index 0752b5e51c7..e5d1a06c8ae 100644 --- a/usr.sbin/bind/lib/isc/netscope.c +++ b/usr.sbin/bind/lib/isc/netscope.c @@ -18,10 +18,10 @@ #if defined(LIBC_SCCS) && !defined(lint) static char rcsid[] = - "$Id: netscope.c,v 1.6 2020/01/20 18:49:46 florian Exp $"; + "$Id: netscope.c,v 1.7 2020/01/22 13:02:10 florian Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <config.h> + #include <stdlib.h> #include <string.h> #include <isc/net.h> diff --git a/usr.sbin/bind/lib/isc/nothreads/condition.c b/usr.sbin/bind/lib/isc/nothreads/condition.c index de3f7a05bf8..00006768827 100644 --- a/usr.sbin/bind/lib/isc/nothreads/condition.c +++ b/usr.sbin/bind/lib/isc/nothreads/condition.c @@ -14,9 +14,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: condition.c,v 1.3 2019/12/17 01:46:36 sthen Exp $ */ +/* $Id: condition.c,v 1.4 2020/01/22 13:02:10 florian Exp $ */ + -#include <config.h> #include <isc/util.h> diff --git a/usr.sbin/bind/lib/isc/nothreads/thread.c b/usr.sbin/bind/lib/isc/nothreads/thread.c index a9e6eaa6994..69564e86883 100644 --- a/usr.sbin/bind/lib/isc/nothreads/thread.c +++ b/usr.sbin/bind/lib/isc/nothreads/thread.c @@ -14,9 +14,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: thread.c,v 1.3 2019/12/17 01:46:36 sthen Exp $ */ +/* $Id: thread.c,v 1.4 2020/01/22 13:02:10 florian Exp $ */ + -#include <config.h> #include <isc/thread.h> #include <isc/util.h> diff --git a/usr.sbin/bind/lib/isc/parseint.c b/usr.sbin/bind/lib/isc/parseint.c index 0a6c37afcbd..b62fb3577d4 100644 --- a/usr.sbin/bind/lib/isc/parseint.c +++ b/usr.sbin/bind/lib/isc/parseint.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: parseint.c,v 1.5 2020/01/09 18:17:19 florian Exp $ */ +/* $Id: parseint.c,v 1.6 2020/01/22 13:02:10 florian Exp $ */ /*! \file */ -#include <config.h> + #include <ctype.h> #include <errno.h> diff --git a/usr.sbin/bind/lib/isc/refcount.c b/usr.sbin/bind/lib/isc/refcount.c index 475b459adc6..36516eda3b2 100644 --- a/usr.sbin/bind/lib/isc/refcount.c +++ b/usr.sbin/bind/lib/isc/refcount.c @@ -14,9 +14,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: refcount.c,v 1.5 2020/01/21 23:59:20 tedu Exp $ */ +/* $Id: refcount.c,v 1.6 2020/01/22 13:02:10 florian Exp $ */ + -#include <config.h> #include <stddef.h> diff --git a/usr.sbin/bind/lib/isc/regex.c b/usr.sbin/bind/lib/isc/regex.c index bd733042dcd..df73e2fdffd 100644 --- a/usr.sbin/bind/lib/isc/regex.c +++ b/usr.sbin/bind/lib/isc/regex.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include <config.h> + #include <isc/file.h> diff --git a/usr.sbin/bind/lib/isc/region.c b/usr.sbin/bind/lib/isc/region.c index 2e9a4e7bef3..22172b493ee 100644 --- a/usr.sbin/bind/lib/isc/region.c +++ b/usr.sbin/bind/lib/isc/region.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: region.c,v 1.3 2019/12/17 01:46:34 sthen Exp $ */ +/* $Id: region.c,v 1.4 2020/01/22 13:02:10 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stdlib.h> #include <string.h> diff --git a/usr.sbin/bind/lib/isc/result.c b/usr.sbin/bind/lib/isc/result.c index a2764971905..e01cde307ab 100644 --- a/usr.sbin/bind/lib/isc/result.c +++ b/usr.sbin/bind/lib/isc/result.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: result.c,v 1.5 2020/01/21 23:59:20 tedu Exp $ */ +/* $Id: result.c,v 1.6 2020/01/22 13:02:10 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stddef.h> #include <stdlib.h> diff --git a/usr.sbin/bind/lib/isc/rwlock.c b/usr.sbin/bind/lib/isc/rwlock.c index 95d4d05ed42..c1d8d5d8d10 100644 --- a/usr.sbin/bind/lib/isc/rwlock.c +++ b/usr.sbin/bind/lib/isc/rwlock.c @@ -14,18 +14,18 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rwlock.c,v 1.10 2020/01/09 18:14:48 florian Exp $ */ +/* $Id: rwlock.c,v 1.11 2020/01/22 13:02:10 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stddef.h> #include <isc/magic.h> #include <isc/msgs.h> -#include <isc/platform.h> + #include <isc/rwlock.h> #include <isc/util.h> diff --git a/usr.sbin/bind/lib/isc/safe.c b/usr.sbin/bind/lib/isc/safe.c index 9da6463efa7..05d5f4797c7 100644 --- a/usr.sbin/bind/lib/isc/safe.c +++ b/usr.sbin/bind/lib/isc/safe.c @@ -16,7 +16,7 @@ /*! \file */ -#include <config.h> + #include <isc/safe.h> #include <string.h> diff --git a/usr.sbin/bind/lib/isc/serial.c b/usr.sbin/bind/lib/isc/serial.c index ebfbbfc0cfb..579c47c1a03 100644 --- a/usr.sbin/bind/lib/isc/serial.c +++ b/usr.sbin/bind/lib/isc/serial.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: serial.c,v 1.4 2020/01/09 18:17:19 florian Exp $ */ +/* $Id: serial.c,v 1.5 2020/01/22 13:02:10 florian Exp $ */ /*! \file */ -#include <config.h> + #include <isc/serial.h> diff --git a/usr.sbin/bind/lib/isc/sha1.c b/usr.sbin/bind/lib/isc/sha1.c index eecf63f9dfa..bb6060254fc 100644 --- a/usr.sbin/bind/lib/isc/sha1.c +++ b/usr.sbin/bind/lib/isc/sha1.c @@ -14,10 +14,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sha1.c,v 1.11 2020/01/22 06:47:15 florian Exp $ */ +/* $Id: sha1.c,v 1.12 2020/01/22 13:02:10 florian Exp $ */ /* $NetBSD: sha1.c,v 1.5 2000/01/22 22:19:14 mycroft Exp $ */ -/* $OpenBSD: sha1.c,v 1.11 2020/01/22 06:47:15 florian Exp $ */ +/* $OpenBSD: sha1.c,v 1.12 2020/01/22 13:02:10 florian Exp $ */ /*! \file * SHA-1 in C @@ -34,10 +34,10 @@ * \endverbatim */ -#include "config.h" + #include <isc/assertions.h> -#include <isc/platform.h> + #include <isc/safe.h> #include <isc/sha1.h> #include <string.h> diff --git a/usr.sbin/bind/lib/isc/sha2.c b/usr.sbin/bind/lib/isc/sha2.c index b111ba67425..16dc74d6a0b 100644 --- a/usr.sbin/bind/lib/isc/sha2.c +++ b/usr.sbin/bind/lib/isc/sha2.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sha2.c,v 1.10 2020/01/22 06:47:15 florian Exp $ */ +/* $Id: sha2.c,v 1.11 2020/01/22 13:02:10 florian Exp $ */ /* $FreeBSD: src/sys/crypto/sha2/sha2.c,v 1.2.2.2 2002/03/05 08:36:47 ume Exp $ */ /* $KAME: sha2.c,v 1.8 2001/11/08 01:07:52 itojun Exp $ */ @@ -55,10 +55,10 @@ */ -#include <config.h> + #include <isc/assertions.h> -#include <isc/platform.h> + #include <isc/safe.h> #include <isc/sha2.h> #include <string.h> diff --git a/usr.sbin/bind/lib/isc/sockaddr.c b/usr.sbin/bind/lib/isc/sockaddr.c index 1f200617930..6e62fcca17f 100644 --- a/usr.sbin/bind/lib/isc/sockaddr.c +++ b/usr.sbin/bind/lib/isc/sockaddr.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sockaddr.c,v 1.14 2020/01/20 18:49:46 florian Exp $ */ +/* $Id: sockaddr.c,v 1.15 2020/01/22 13:02:10 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stdio.h> diff --git a/usr.sbin/bind/lib/isc/socket_api.c b/usr.sbin/bind/lib/isc/socket_api.c index 771d89e6e46..1abfd1c8611 100644 --- a/usr.sbin/bind/lib/isc/socket_api.c +++ b/usr.sbin/bind/lib/isc/socket_api.c @@ -14,9 +14,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: socket_api.c,v 1.6 2020/01/21 23:59:20 tedu Exp $ */ +/* $Id: socket_api.c,v 1.7 2020/01/22 13:02:10 florian Exp $ */ + -#include <config.h> #include <isc/app.h> #include <isc/magic.h> diff --git a/usr.sbin/bind/lib/isc/symtab.c b/usr.sbin/bind/lib/isc/symtab.c index eca6cf638bc..27a2c506764 100644 --- a/usr.sbin/bind/lib/isc/symtab.c +++ b/usr.sbin/bind/lib/isc/symtab.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: symtab.c,v 1.5 2020/01/20 18:51:53 florian Exp $ */ +/* $Id: symtab.c,v 1.6 2020/01/22 13:02:10 florian Exp $ */ /*! \file */ -#include <config.h> + #include <ctype.h> #include <stdlib.h> diff --git a/usr.sbin/bind/lib/isc/task.c b/usr.sbin/bind/lib/isc/task.c index 3f8e2af2b36..66df95bac6a 100644 --- a/usr.sbin/bind/lib/isc/task.c +++ b/usr.sbin/bind/lib/isc/task.c @@ -23,7 +23,7 @@ * for changing states. */ -#include <config.h> + #include <stdlib.h> #include <isc/app.h> #include <isc/condition.h> @@ -33,7 +33,7 @@ #include <isc/msgs.h> #include <isc/once.h> -#include <isc/platform.h> + #include <string.h> #include <isc/task.h> diff --git a/usr.sbin/bind/lib/isc/timer.c b/usr.sbin/bind/lib/isc/timer.c index 9df569ed814..5f298395774 100644 --- a/usr.sbin/bind/lib/isc/timer.c +++ b/usr.sbin/bind/lib/isc/timer.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: timer.c,v 1.14 2020/01/21 23:59:20 tedu Exp $ */ +/* $Id: timer.c,v 1.15 2020/01/22 13:02:10 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stdlib.h> #include <isc/app.h> #include <isc/condition.h> @@ -28,7 +28,7 @@ #include <isc/msgs.h> #include <isc/once.h> -#include <isc/platform.h> + #include <isc/task.h> #include <isc/thread.h> diff --git a/usr.sbin/bind/lib/isc/unix/app.c b/usr.sbin/bind/lib/isc/unix/app.c index 287e5625776..d188990d624 100644 --- a/usr.sbin/bind/lib/isc/unix/app.c +++ b/usr.sbin/bind/lib/isc/unix/app.c @@ -16,7 +16,7 @@ /*! \file */ -#include <config.h> + #include <sys/param.h> /* Openserver 5.0.6A and FD_SETSIZE */ #include <sys/types.h> @@ -34,7 +34,7 @@ #include <isc/msgs.h> #include <isc/event.h> -#include <isc/platform.h> + #include <isc/strerror.h> #include <string.h> #include <isc/task.h> diff --git a/usr.sbin/bind/lib/isc/unix/dir.c b/usr.sbin/bind/lib/isc/unix/dir.c index 4f11b152389..b3e8e017ba0 100644 --- a/usr.sbin/bind/lib/isc/unix/dir.c +++ b/usr.sbin/bind/lib/isc/unix/dir.c @@ -17,7 +17,7 @@ /*! \file * \author Principal Authors: DCL */ -#include <config.h> + #include <sys/types.h> #include <sys/stat.h> diff --git a/usr.sbin/bind/lib/isc/unix/errno.c b/usr.sbin/bind/lib/isc/unix/errno.c index b7292338adb..6117fa70b40 100644 --- a/usr.sbin/bind/lib/isc/unix/errno.c +++ b/usr.sbin/bind/lib/isc/unix/errno.c @@ -16,7 +16,7 @@ /*! \file */ -#include <config.h> + #include <isc/errno.h> #include <isc/util.h> diff --git a/usr.sbin/bind/lib/isc/unix/errno2result.c b/usr.sbin/bind/lib/isc/unix/errno2result.c index baac7805d6b..573200e2d70 100644 --- a/usr.sbin/bind/lib/isc/unix/errno2result.c +++ b/usr.sbin/bind/lib/isc/unix/errno2result.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: errno2result.c,v 1.3 2019/12/17 01:46:37 sthen Exp $ */ +/* $Id: errno2result.c,v 1.4 2020/01/22 13:02:10 florian Exp $ */ /*! \file */ -#include <config.h> + #include <isc/result.h> #include <isc/strerror.h> diff --git a/usr.sbin/bind/lib/isc/unix/file.c b/usr.sbin/bind/lib/isc/unix/file.c index e9eeb9a9077..b6ff1c7556e 100644 --- a/usr.sbin/bind/lib/isc/unix/file.c +++ b/usr.sbin/bind/lib/isc/unix/file.c @@ -43,11 +43,11 @@ * SUCH DAMAGE. */ -/* $Id: file.c,v 1.13 2020/01/22 08:17:01 tedu Exp $ */ +/* $Id: file.c,v 1.14 2020/01/22 13:02:10 florian Exp $ */ /*! \file */ -#include <config.h> + #include <errno.h> #include <fcntl.h> diff --git a/usr.sbin/bind/lib/isc/unix/fsaccess.c b/usr.sbin/bind/lib/isc/unix/fsaccess.c index a68d84efb9f..f1fe7e72537 100644 --- a/usr.sbin/bind/lib/isc/unix/fsaccess.c +++ b/usr.sbin/bind/lib/isc/unix/fsaccess.c @@ -14,9 +14,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: fsaccess.c,v 1.6 2019/12/17 01:46:37 sthen Exp $ */ +/* $Id: fsaccess.c,v 1.7 2020/01/22 13:02:10 florian Exp $ */ + -#include <config.h> #include <sys/types.h> #include <sys/stat.h> diff --git a/usr.sbin/bind/lib/isc/unix/include/isc/net.h b/usr.sbin/bind/lib/isc/unix/include/isc/net.h index cf5c96bce9f..a6f673d17c5 100644 --- a/usr.sbin/bind/lib/isc/unix/include/isc/net.h +++ b/usr.sbin/bind/lib/isc/unix/include/isc/net.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: net.h,v 1.5 2020/01/09 18:17:20 florian Exp $ */ +/* $Id: net.h,v 1.6 2020/01/22 13:02:10 florian Exp $ */ #ifndef ISC_NET_H #define ISC_NET_H 1 @@ -71,7 +71,7 @@ /*** *** Imports. ***/ -#include <isc/platform.h> + #include <sys/types.h> #include <sys/socket.h> /* Contractual promise. */ diff --git a/usr.sbin/bind/lib/isc/unix/ipv6.c b/usr.sbin/bind/lib/isc/unix/ipv6.c index 92da08d4051..9c7f93b00a8 100644 --- a/usr.sbin/bind/lib/isc/unix/ipv6.c +++ b/usr.sbin/bind/lib/isc/unix/ipv6.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ipv6.c,v 1.3 2019/12/17 01:46:37 sthen Exp $ */ +/* $Id: ipv6.c,v 1.4 2020/01/22 13:02:10 florian Exp $ */ /*! \file */ -#include <config.h> + #include <isc/ipv6.h> diff --git a/usr.sbin/bind/lib/isc/unix/net.c b/usr.sbin/bind/lib/isc/unix/net.c index f579098aab9..b58435cf5d1 100644 --- a/usr.sbin/bind/lib/isc/unix/net.c +++ b/usr.sbin/bind/lib/isc/unix/net.c @@ -14,9 +14,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: net.c,v 1.14 2020/01/22 12:58:35 florian Exp $ */ +/* $Id: net.c,v 1.15 2020/01/22 13:02:10 florian Exp $ */ + -#include <config.h> #include <sys/types.h> diff --git a/usr.sbin/bind/lib/isc/unix/socket.c b/usr.sbin/bind/lib/isc/unix/socket.c index 4ab1098049b..ce270134b60 100644 --- a/usr.sbin/bind/lib/isc/unix/socket.c +++ b/usr.sbin/bind/lib/isc/unix/socket.c @@ -16,7 +16,7 @@ /*! \file */ -#include <config.h> + #include <sys/param.h> #include <sys/types.h> @@ -44,7 +44,7 @@ #include <isc/msgs.h> #include <isc/net.h> #include <isc/once.h> -#include <isc/platform.h> + #include <isc/region.h> #include <isc/socket.h> diff --git a/usr.sbin/bind/lib/isc/unix/stdio.c b/usr.sbin/bind/lib/isc/unix/stdio.c index 09b203b8025..cf1ee755358 100644 --- a/usr.sbin/bind/lib/isc/unix/stdio.c +++ b/usr.sbin/bind/lib/isc/unix/stdio.c @@ -14,9 +14,9 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: stdio.c,v 1.4 2020/01/22 08:17:01 tedu Exp $ */ +/* $Id: stdio.c,v 1.5 2020/01/22 13:02:10 florian Exp $ */ + -#include <config.h> #include <errno.h> #include <unistd.h> diff --git a/usr.sbin/bind/lib/isc/unix/stdtime.c b/usr.sbin/bind/lib/isc/unix/stdtime.c index bbb2c610a65..0937dde7527 100644 --- a/usr.sbin/bind/lib/isc/unix/stdtime.c +++ b/usr.sbin/bind/lib/isc/unix/stdtime.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: stdtime.c,v 1.3 2019/12/17 01:46:37 sthen Exp $ */ +/* $Id: stdtime.c,v 1.4 2020/01/22 13:02:10 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stddef.h> /* NULL */ #include <stdlib.h> /* NULL */ diff --git a/usr.sbin/bind/lib/isc/unix/strerror.c b/usr.sbin/bind/lib/isc/unix/strerror.c index 16a7fdb0e14..b50b5bcaae1 100644 --- a/usr.sbin/bind/lib/isc/unix/strerror.c +++ b/usr.sbin/bind/lib/isc/unix/strerror.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: strerror.c,v 1.6 2020/01/21 23:59:20 tedu Exp $ */ +/* $Id: strerror.c,v 1.7 2020/01/22 13:02:10 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stdio.h> #include <string.h> diff --git a/usr.sbin/bind/lib/isc/unix/syslog.c b/usr.sbin/bind/lib/isc/unix/syslog.c index b267e898244..147e36c5131 100644 --- a/usr.sbin/bind/lib/isc/unix/syslog.c +++ b/usr.sbin/bind/lib/isc/unix/syslog.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: syslog.c,v 1.4 2020/01/20 18:49:46 florian Exp $ */ +/* $Id: syslog.c,v 1.5 2020/01/22 13:02:10 florian Exp $ */ /*! \file */ -#include <config.h> + #include <stdlib.h> #include <syslog.h> diff --git a/usr.sbin/bind/lib/isc/unix/time.c b/usr.sbin/bind/lib/isc/unix/time.c index a25537356f4..3a8f74f0d42 100644 --- a/usr.sbin/bind/lib/isc/unix/time.c +++ b/usr.sbin/bind/lib/isc/unix/time.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: time.c,v 1.11 2020/01/20 18:49:46 florian Exp $ */ +/* $Id: time.c,v 1.12 2020/01/22 13:02:10 florian Exp $ */ /*! \file */ -#include <config.h> + #include <errno.h> #include <limits.h> @@ -29,7 +29,7 @@ #include <sys/time.h> /* Required for struct timeval on some platforms. */ #include <isc/log.h> -#include <isc/platform.h> + #include <isc/strerror.h> #include <string.h> diff --git a/usr.sbin/bind/lib/isccfg/dnsconf.c b/usr.sbin/bind/lib/isccfg/dnsconf.c index c2670c99ea2..64388121b07 100644 --- a/usr.sbin/bind/lib/isccfg/dnsconf.c +++ b/usr.sbin/bind/lib/isccfg/dnsconf.c @@ -14,11 +14,11 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnsconf.c,v 1.3 2020/01/09 14:18:30 florian Exp $ */ +/* $Id: dnsconf.c,v 1.4 2020/01/22 13:02:10 florian Exp $ */ /*! \file */ -#include <config.h> + #include <isccfg/cfg.h> #include <isccfg/grammar.h> diff --git a/usr.sbin/bind/lib/isccfg/namedconf.c b/usr.sbin/bind/lib/isccfg/namedconf.c index db9df6330b6..b7ab4df1213 100644 --- a/usr.sbin/bind/lib/isccfg/namedconf.c +++ b/usr.sbin/bind/lib/isccfg/namedconf.c @@ -16,7 +16,7 @@ /*! \file */ -#include <config.h> + #include <stdint.h> #include <stdlib.h> diff --git a/usr.sbin/bind/lib/isccfg/parser.c b/usr.sbin/bind/lib/isccfg/parser.c index 18c49812526..73ab0c5a4e3 100644 --- a/usr.sbin/bind/lib/isccfg/parser.c +++ b/usr.sbin/bind/lib/isccfg/parser.c @@ -16,7 +16,7 @@ /*! \file */ -#include <config.h> + #include <stdlib.h> diff --git a/usr.sbin/bind/lib/lwres/lwconfig.c b/usr.sbin/bind/lib/lwres/lwconfig.c index 81dc439a5aa..bd4a6ca79a1 100644 --- a/usr.sbin/bind/lib/lwres/lwconfig.c +++ b/usr.sbin/bind/lib/lwres/lwconfig.c @@ -50,7 +50,7 @@ * /etc/resolv.conf */ -#include <config.h> + #include <assert.h> #include <ctype.h> |