From 36bfe8878323cd4a24572c91c14617884f6e7326 Mon Sep 17 00:00:00 2001
From: Ed Robbins <edd.robbins@gmail.com>
Date: Sat, 30 Jul 2016 21:56:17 +0000
Subject: Check for __HAIKU__ definition as well as ____i


diff --git a/src/dos.c b/src/dos.c
index 1223064..17cddec 100644
--- a/src/dos.c
+++ b/src/dos.c
@@ -18,7 +18,7 @@
 #include "util.h"
 #include "windows.h"
 
-#ifdef __unix__
+#if defined(__unix__) || defined(__HAIKU__)
 # include <unistd.h>
 
 # ifndef O_BINARY
diff --git a/src/game.c b/src/game.c
index aaa5b65..6c43e06 100644
--- a/src/game.c
+++ b/src/game.c
@@ -52,7 +52,7 @@ game_initialise (void)
       return false;
     }
 
-#ifdef __unix__
+#if defined(__unix__) || defined(__HAIKU__)
   /* clean up after SDL messing around where it shouldn't */
   unix_restore_signal_handlers ();
 #endif
diff --git a/src/unix.c b/src/unix.c
index 6365c13..8d2c4ff 100644
--- a/src/unix.c
+++ b/src/unix.c
@@ -1,4 +1,4 @@
-#ifdef __unix__
+#if defined(__unix__) || defined(__HAIKU__)
 
 #include <signal.h>
 #include <stdio.h>
diff --git a/src/unix.h b/src/unix.h
index 4ff7668..7d31dda 100644
--- a/src/unix.h
+++ b/src/unix.h
@@ -1,7 +1,7 @@
 #ifndef UNIX_H
 #define UNIX_H
 
-#ifdef __unix__
+#if defined(__unix__) || defined(__HAIKU__)
 
 #include <stdbool.h>
 
diff --git a/src/util.h b/src/util.h
index 4aca9b2..38b7d12 100644
--- a/src/util.h
+++ b/src/util.h
@@ -12,7 +12,7 @@
 # define MAX(a, b) ((a) > (b) ? (a) : (b))
 #endif
 
-#ifdef __unix__
+#if defined(__unix__) || defined(__HAIKU__)
 # define FS_SEP '/'
 # define FS_SEP_STR "/"
 #elif defined _WIN32
-- 
2.7.0


From 18e16c05789c6d5dff769a762e79411699634edb Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 6 Aug 2016 22:38:37 +0200
Subject: disable fullscreen


diff --git a/src/main.c b/src/main.c
index 342d257..1ae06fa 100644
--- a/src/main.c
+++ b/src/main.c
@@ -74,7 +74,7 @@ main (int argc, char **argv)
 {
   int retval;
 
-  display_set_full_screen (true);
+  display_set_full_screen (false);
   display_set_lowres_stretch (true);
 
   process_options (&argc, &argv);
-- 
2.7.0

