This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=ab5a555339f51d823fead64d9e740a31099e4011 commit ab5a555339f51d823fead64d9e740a31099e4011 Author: Guillem Jover <[email protected]> AuthorDate: Tue Feb 25 05:21:26 2025 +0100 s-s-d: Move <compat.h> and <dpkg/macros.h> after OS and header setup macros We are setting several macros to change the behavior of headers we are including, and because we might end up including multiple of them depending on the compatibility code enabled or for types from the <dpkg/macros.h> header, these might end up not taking effect, later on due to header re-inclusion protection. So we need to define those as early as possible, which means just after <config.h> and before anything else. This fixes a build failure on NetBSD 10.1, where the _KMEMUSER was not taking effect and the <proc.h> was missing definitions for the vaddr_t type. Changelog: porting --- utils/start-stop-daemon.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c index e7ed8f4c8..861d77a33 100644 --- a/utils/start-stop-daemon.c +++ b/utils/start-stop-daemon.c @@ -25,9 +25,6 @@ #if !DPKG_STRUCTURED_PROCFS_SUPPORTS_LFS #undef _FILE_OFFSET_BITS #endif -#include <compat.h> - -#include <dpkg/macros.h> #if defined(__linux__) # define OS_Linux @@ -61,6 +58,10 @@ #define _STRUCTURED_PROC 1 #endif +#include <compat.h> + +#include <dpkg/macros.h> + #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> #endif -- Dpkg.Org's dpkg
