mirror of
git://anongit.mindrot.org/openssh.git
synced 2025-01-13 21:21:16 +00:00
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.
This commit is contained in:
parent
2421a567a8
commit
1cd67ee15c
@ -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"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user