summaryrefslogtreecommitdiff
path: root/src/grp-login
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-08-02 22:00:19 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-08-02 22:00:19 -0400
commitd36719f5c99324b1c37e32b217e4aff845683d59 (patch)
tree09b5ff5a93086e9df4fffca3b9abd948411db203 /src/grp-login
parent6307f4b04226bc15d2ab35b6d167f601f8537075 (diff)
ensure that include order of headers does not matter
Diffstat (limited to 'src/grp-login')
-rw-r--r--src/grp-login/liblogind-core/logind-button.h4
-rw-r--r--src/grp-login/liblogind-core/logind-session-device.h5
-rw-r--r--src/grp-login/liblogind-core/logind-user.h3
-rw-r--r--src/grp-login/liblogind-core/logind.h (renamed from src/grp-login/systemd-logind/logind.h)5
4 files changed, 10 insertions, 7 deletions
diff --git a/src/grp-login/liblogind-core/logind-button.h b/src/grp-login/liblogind-core/logind-button.h
index 876e4d3cdf..f30cba2959 100644
--- a/src/grp-login/liblogind-core/logind-button.h
+++ b/src/grp-login/liblogind-core/logind-button.h
@@ -19,10 +19,10 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include "logind.h"
-
typedef struct Button Button;
+#include "logind.h"
+
struct Button {
Manager *manager;
diff --git a/src/grp-login/liblogind-core/logind-session-device.h b/src/grp-login/liblogind-core/logind-session-device.h
index c20962f21c..4a22decb1d 100644
--- a/src/grp-login/liblogind-core/logind-session-device.h
+++ b/src/grp-login/liblogind-core/logind-session-device.h
@@ -19,12 +19,13 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-typedef enum DeviceType DeviceType;
#include "basic/list.h"
-#include "logind.h"
+typedef enum DeviceType DeviceType;
typedef struct SessionDevice SessionDevice;
+#include "logind.h"
+
enum DeviceType {
DEVICE_TYPE_UNKNOWN,
DEVICE_TYPE_DRM,
diff --git a/src/grp-login/liblogind-core/logind-user.h b/src/grp-login/liblogind-core/logind-user.h
index 8663be3994..b23c59fa1d 100644
--- a/src/grp-login/liblogind-core/logind-user.h
+++ b/src/grp-login/liblogind-core/logind-user.h
@@ -20,10 +20,11 @@
***/
#include "basic/list.h"
-#include "logind.h"
typedef struct User User;
+#include "logind.h"
+
typedef enum UserState {
USER_OFFLINE, /* Not logged in at all */
USER_OPENING, /* Is logging in */
diff --git a/src/grp-login/systemd-logind/logind.h b/src/grp-login/liblogind-core/logind.h
index 378e86a31f..effc498118 100644
--- a/src/grp-login/systemd-logind/logind.h
+++ b/src/grp-login/liblogind-core/logind.h
@@ -28,13 +28,14 @@
#include "basic/hashmap.h"
#include "basic/list.h"
#include "basic/set.h"
+
+typedef struct Manager Manager;
+
#include "logind-action.h"
#include "logind-button.h"
#include "logind-device.h"
#include "logind-inhibit.h"
-typedef struct Manager Manager;
-
struct Manager {
sd_event *event;
sd_bus *bus;