From: Darren Tucker <dtucker@dtucker.net>
Date: Fri, 12 Mar 2021 02:16:10 +0000 (+1100)
Subject: Move generic includes outside of ifdef.
X-Git-Tag: V_8_6_P1~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cd67ee15ce3d192ab51be22bc4872a6a7a4b6d9;p=thirdparty%2Fopenssh-portable.git

Move generic includes outside of ifdef.

This ensures that the macros in log.h are defined in the case where
either of --with-solaris-projects or --with-solaris-privs are used
without --with-solaris-contracts.  bz#3278.
---

diff --git a/openbsd-compat/port-solaris.c b/openbsd-compat/port-solaris.c
index 7d5a28cd0..b84fbff5e 100644
--- a/openbsd-compat/port-solaris.c
+++ b/openbsd-compat/port-solaris.c
@@ -17,8 +17,6 @@
 #include "config.h"
 #include "includes.h"
 
-#ifdef USE_SOLARIS_PROCESS_CONTRACTS
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
@@ -31,12 +29,14 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "log.h"
+
+#ifdef USE_SOLARIS_PROCESS_CONTRACTS
+
 #include <libcontract.h>
 #include <sys/contract/process.h>
 #include <sys/ctfs.h>
 
-#include "log.h"
-
 #define CT_TEMPLATE	CTFS_ROOT "/process/template"
 #define CT_LATEST	CTFS_ROOT "/process/latest"