diff options
| author | Colin Walters <walters@verbum.org> | 2010-03-16 16:04:15 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-03-16 16:11:14 -0400 |
| commit | ebfa7c02fd67777684d39389e25346819836dcca (patch) | |
| tree | 93c2b9876ce960cbf2fa27dad9fb017184b7610b /bus/selinux.c | |
| parent | acbc751e28446696fee92c236cfef176786409d5 (diff) | |
| parent | ce34415302af586ea6ca9b0da4b21a7025041ef7 (diff) | |
| download | dbus-ebfa7c02fd67777684d39389e25346819836dcca.tar.gz | |
Merge branch 'dbus-1.2'
Conflicts:
bus/bus.c
configure.in
Diffstat (limited to 'bus/selinux.c')
| -rw-r--r-- | bus/selinux.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bus/selinux.c b/bus/selinux.c index 996cf1d8..c4b33d6d 100644 --- a/bus/selinux.c +++ b/bus/selinux.c @@ -31,12 +31,12 @@ #include "utils.h" #include "config-parser.h" -#ifdef HAVE_SELINUX -#include <sys/types.h> -#include <unistd.h> #ifdef HAVE_ERRNO_H #include <errno.h> #endif +#ifdef HAVE_SELINUX +#include <sys/types.h> +#include <unistd.h> #include <limits.h> #include <pthread.h> #include <syslog.h> @@ -48,11 +48,11 @@ #include <stdarg.h> #include <stdio.h> #include <grp.h> +#endif /* HAVE_SELINUX */ #ifdef HAVE_LIBAUDIT #include <cap-ng.h> #include <libaudit.h> #endif /* HAVE_LIBAUDIT */ -#endif /* HAVE_SELINUX */ #define BUS_SID_FROM_SELINUX(sid) ((BusSELinuxID*) (sid)) #define SELINUX_SID_FROM_BUS(sid) ((security_id_t) (sid)) |