Merge branch 'master' into opengl3

[irrlicht.git] / source / Irrlicht / CIrrDeviceLinux.h

diff --git a/source/Irrlicht/CIrrDeviceLinux.h b/source/Irrlicht/CIrrDeviceLinux.h
index 45d3f10ccea12136aad55655d3903872d66e6633..2d8945c9b5d907911bde4fc9836fb8da8c3a4090 100644 (file)
--- a/source/Irrlicht/CIrrDeviceLinux.h
+++ b/source/Irrlicht/CIrrDeviceLinux.h
@@ -413,6 +413,9 @@ namespace irr
                bool HasNetWM;\r
                // text is utf-8\r
                mutable core::stringc Clipboard;\r
+#endif\r
+#if defined(_IRR_LINUX_X11_XINPUT2_)\r
+               int currentTouchedCount;\r
 #endif\r
                u32 Width, Height;\r
                bool WindowHasFocus;\r
@@ -453,10 +456,6 @@ namespace irr
                };\r
                core::array<JoystickInfo> ActiveJoysticks;\r
 #endif\r
-\r
-#if defined(_IRR_LINUX_X11_XINPUT2_)\r
-               int currentTouchedCount;\r
-#endif\r
        };\r
 \r
 \r