diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2021-03-12 13:16:10 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-03-12 13:16:10 +1100 |
| commit | 1cd67ee15ce3d192ab51be22bc4872a6a7a4b6d9 (patch) | |
| tree | 4ff0f6e839d7a4f04488ca357e1638e8bc6d46ff | |
| parent | 2421a567a8862fe5102a4e7d60003ebffd1313dd (diff) | |
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.
| -rw-r--r-- | openbsd-compat/port-solaris.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openbsd-compat/port-solaris.c b/openbsd-compat/port-solaris.c index 7d5a28cd..b84fbff5 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" |