From a294a842cb85f86cdd69b6e902aef01c9721668b Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 11 Aug 2018 13:05:48 +0200
Subject: Rebase patches for fixing haiku build.

---
 platform/haiku/haiku_direct_window.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'platform/haiku/haiku_direct_window.h')

diff --git a/platform/haiku/haiku_direct_window.h b/platform/haiku/haiku_direct_window.h
index 55c2f5fccc..eee09191fa 100644
--- a/platform/haiku/haiku_direct_window.h
+++ b/platform/haiku/haiku_direct_window.h
@@ -31,9 +31,10 @@
 #ifndef HAIKU_DIRECT_WINDOW_H
 #define HAIKU_DIRECT_WINDOW_H
 
-#include <DirectWindow.h>
 #include <kernel/image.h> // needed for image_id
 
+#include <DirectWindow.h>
+
 #include "core/os/os.h"
 #include "main/input_default.h"
 
@@ -63,7 +64,7 @@ private:
 	void HandleWindowResized(BMessage *message);
 	void HandleKeyboardEvent(BMessage *message);
 	void HandleKeyboardModifierEvent(BMessage *message);
-	inline InputModifierState GetKeyModifierState(uint32 p_state);
+	inline void GetKeyModifierState(Ref<InputEventWithModifiers> event, uint32 p_state);
 	inline int GetMouseButtonState(uint32 p_state);
 
 public:
-- 
cgit v1.2.3