upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix to remove unused whitespace from acx_nlnetlabs.m4 and config.h.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2023-05-04 11:17:06 +02:00
parent 806c3d7330
commit 8dd09e31d2
3 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
acx_nlnetlabs.m4
View file

@ -2,7 +2,8 @@
# Copyright 2009, Wouter Wijngaards, NLnet Labs. # Copyright 2009, Wouter Wijngaards, NLnet Labs.
# BSD licensed. # BSD licensed.
# #
# Version 45 # Version 46
# 2023-05-04 fix to remove unused whitespace.
# 2023-01-26 fix -Wstrict-prototypes. # 2023-01-26 fix -Wstrict-prototypes.
# 2022-09-01 fix checking if nonblocking sockets work on OpenBSD. # 2022-09-01 fix checking if nonblocking sockets work on OpenBSD.
# 2021-08-17 fix sed script in ssldir split handling. # 2021-08-17 fix sed script in ssldir split handling.
@ -476,7 +477,7 @@ fi
dnl Setup ATTR_FORMAT config.h parts. dnl Setup ATTR_FORMAT config.h parts.
dnl make sure you call ACX_CHECK_FORMAT_ATTRIBUTE also. dnl make sure you call ACX_CHECK_FORMAT_ATTRIBUTE also.
AC_DEFUN([AHX_CONFIG_FORMAT_ATTRIBUTE], AC_DEFUN([AHX_CONFIG_FORMAT_ATTRIBUTE],
[ [
#ifdef HAVE_ATTR_FORMAT #ifdef HAVE_ATTR_FORMAT
# define ATTR_FORMAT(archetype, string_index, first_to_check) \ # define ATTR_FORMAT(archetype, string_index, first_to_check) \
__attribute__ ((format (archetype, string_index, first_to_check))) __attribute__ ((format (archetype, string_index, first_to_check)))
@ -1318,7 +1319,7 @@ AC_DEFUN([AHX_CONFIG_W32_FD_SET_T],
#ifdef HAVE_WINSOCK2_H #ifdef HAVE_WINSOCK2_H
#define FD_SET_T (u_int) #define FD_SET_T (u_int)
#else #else
#define FD_SET_T #define FD_SET_T
#endif #endif
]) ])
@ -1356,7 +1357,7 @@ dnl $3: define value, 1
AC_DEFUN([AHX_CONFIG_FLAG_OMITTED], AC_DEFUN([AHX_CONFIG_FLAG_OMITTED],
[#if defined($1) && !defined($2) [#if defined($1) && !defined($2)
#define $2 $3 #define $2 $3
[#]endif ]) [#]endif])
dnl Wrapper for AHX_CONFIG_FLAG_OMITTED for -D style flags dnl Wrapper for AHX_CONFIG_FLAG_OMITTED for -D style flags
dnl $1: the -DNAME or -DNAME=value string. dnl $1: the -DNAME or -DNAME=value string.

22
config.h.in
View file

@ -1071,39 +1071,39 @@
#if defined(OMITTED__D_GNU_SOURCE) && !defined(_GNU_SOURCE) #if defined(OMITTED__D_GNU_SOURCE) && !defined(_GNU_SOURCE)
#define _GNU_SOURCE 1 #define _GNU_SOURCE 1
#endif #endif
#if defined(OMITTED__D_BSD_SOURCE) && !defined(_BSD_SOURCE) #if defined(OMITTED__D_BSD_SOURCE) && !defined(_BSD_SOURCE)
#define _BSD_SOURCE 1 #define _BSD_SOURCE 1
#endif #endif
#if defined(OMITTED__D_DEFAULT_SOURCE) && !defined(_DEFAULT_SOURCE) #if defined(OMITTED__D_DEFAULT_SOURCE) && !defined(_DEFAULT_SOURCE)
#define _DEFAULT_SOURCE 1 #define _DEFAULT_SOURCE 1
#endif #endif
#if defined(OMITTED__D__EXTENSIONS__) && !defined(__EXTENSIONS__) #if defined(OMITTED__D__EXTENSIONS__) && !defined(__EXTENSIONS__)
#define __EXTENSIONS__ 1 #define __EXTENSIONS__ 1
#endif #endif
#if defined(OMITTED__D_POSIX_C_SOURCE_200112) && !defined(_POSIX_C_SOURCE) #if defined(OMITTED__D_POSIX_C_SOURCE_200112) && !defined(_POSIX_C_SOURCE)
#define _POSIX_C_SOURCE 200112 #define _POSIX_C_SOURCE 200112
#endif #endif
#if defined(OMITTED__D_XOPEN_SOURCE_600) && !defined(_XOPEN_SOURCE) #if defined(OMITTED__D_XOPEN_SOURCE_600) && !defined(_XOPEN_SOURCE)
#define _XOPEN_SOURCE 600 #define _XOPEN_SOURCE 600
#endif #endif
#if defined(OMITTED__D_XOPEN_SOURCE_EXTENDED_1) && !defined(_XOPEN_SOURCE_EXTENDED) #if defined(OMITTED__D_XOPEN_SOURCE_EXTENDED_1) && !defined(_XOPEN_SOURCE_EXTENDED)
#define _XOPEN_SOURCE_EXTENDED 1 #define _XOPEN_SOURCE_EXTENDED 1
#endif #endif
#if defined(OMITTED__D_ALL_SOURCE) && !defined(_ALL_SOURCE) #if defined(OMITTED__D_ALL_SOURCE) && !defined(_ALL_SOURCE)
#define _ALL_SOURCE 1 #define _ALL_SOURCE 1
#endif #endif
#if defined(OMITTED__D_LARGEFILE_SOURCE_1) && !defined(_LARGEFILE_SOURCE) #if defined(OMITTED__D_LARGEFILE_SOURCE_1) && !defined(_LARGEFILE_SOURCE)
#define _LARGEFILE_SOURCE 1 #define _LARGEFILE_SOURCE 1
#endif #endif
@ -1187,7 +1187,7 @@
#endif #endif
#ifdef HAVE_ATTR_FORMAT #ifdef HAVE_ATTR_FORMAT
# define ATTR_FORMAT(archetype, string_index, first_to_check) \ # define ATTR_FORMAT(archetype, string_index, first_to_check) \
__attribute__ ((format (archetype, string_index, first_to_check))) __attribute__ ((format (archetype, string_index, first_to_check)))
@ -1297,7 +1297,7 @@ void* reallocarray(void *ptr, size_t nmemb, size_t size);
#ifdef HAVE_WINSOCK2_H #ifdef HAVE_WINSOCK2_H
#define FD_SET_T (u_int) #define FD_SET_T (u_int)
#else #else
#define FD_SET_T #define FD_SET_T
#endif #endif

1
doc/Changelog
View file

@ -1,6 +1,7 @@
4 May 2023: Wouter 4 May 2023: Wouter
- Fix #885: Error: util/configlexer.c: No such file or directory, - Fix #885: Error: util/configlexer.c: No such file or directory,
adds error messages explaining to install flex and bison. adds error messages explaining to install flex and bison.
- Fix to remove unused whitespace from acx_nlnetlabs.m4 and config.h.
1 May 2023: George 1 May 2023: George
- Merge #722 from David 'eqvinox' Lamparter: NAT64 support. - Merge #722 from David 'eqvinox' Lamparter: NAT64 support.