summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/Xlib
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-02-19 02:17:31 +0100
committerPierre Bourdon <delroth@gmail.com>2014-02-20 01:01:10 +0100
commit6847a0fc0c1699eb01fadd50cfaf76e4e34a02cb (patch)
tree5fed3b04761ae005071ad047c78c2f39eeacf229 /Source/Core/InputCommon/ControllerInterface/Xlib
parentfca12c4c4e6a2cd381a34e5e1bc80ffb22bd35c3 (diff)
Fix more header sorting issues in InputCommon/ (now check-includes clean).
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Xlib')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h6
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
index de2ea1a06a..2714b70221 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
@@ -6,14 +6,14 @@
#pragma once
-#include "InputCommon/ControllerInterface/Device.h"
-
extern "C" {
+#include <X11/keysym.h>
#include <X11/Xlib.h>
#include <X11/extensions/XInput2.h>
-#include <X11/keysym.h>
}
+#include "InputCommon/ControllerInterface/Device.h"
+
namespace ciface
{
namespace XInput2
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
index 8484b9116d..0d2bdab8f8 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
@@ -1,7 +1,7 @@
-#include "InputCommon/ControllerInterface/Xlib/Xlib.h"
-
#include <X11/XKBlib.h>
+#include "InputCommon/ControllerInterface/Xlib/Xlib.h"
+
namespace ciface
{
namespace Xlib