From 3e4656aa9083ced7cf61f323adfb651ba7b80016 Mon Sep 17 00:00:00 2001
From: Bill Lash <william.lash@gmail.com>
Date: Fri, 21 Jun 2019 23:39:22 -0500
Subject: [PATCH] Fix sdl build on MACOS

Need to include sf_frotz.h before system headers for MACOS build
---
 src/sdl/generic.c     | 3 ++-
 src/sdl/sf_fonts.c    | 4 ++--
 src/sdl/sf_ftype.c    | 4 ++--
 src/sdl/sf_images.c   | 4 ++--
 src/sdl/sf_osfdlg.c   | 4 ++--
 src/sdl/sf_resource.c | 3 ++-
 src/sdl/sf_sound.c    | 3 ++-
 src/sdl/sf_util.c     | 4 ++--
 src/sdl/sf_video.c    | 4 ++--
 9 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/sdl/generic.c b/src/sdl/generic.c
index 670a81a..148eec9 100644
--- a/src/sdl/generic.c
+++ b/src/sdl/generic.c
@@ -5,6 +5,8 @@
  * really be put somewhere so that they can be shared.  For now, this.
  */
 
+#include "../common/frotz.h"
+
 #include <stddef.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -12,7 +14,6 @@
 #include <string.h>
 
 #include "../blorb/blorb.h"
-#include "../common/frotz.h"
 #include "generic.h"
 
 FILE *blorb_fp;
diff --git a/src/sdl/sf_fonts.c b/src/sdl/sf_fonts.c
index 2d236a5..63f8504 100644
--- a/src/sdl/sf_fonts.c
+++ b/src/sdl/sf_fonts.c
@@ -1,9 +1,9 @@
+#include "sf_frotz.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "sf_frotz.h"
-
 // font handling
 
 /*
diff --git a/src/sdl/sf_ftype.c b/src/sdl/sf_ftype.c
index b4d0a63..537c430 100644
--- a/src/sdl/sf_ftype.c
+++ b/src/sdl/sf_ftype.c
@@ -1,3 +1,5 @@
+#include "sf_frotz.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -7,8 +9,6 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-#include "sf_frotz.h"
-
 /////////////////////////////////////////////////////////////////
 
 static char * sf_searchfile( char *fn, int fnlen, char *buf, char *paths)
diff --git a/src/sdl/sf_images.c b/src/sdl/sf_images.c
index 358ae22..787bd94 100644
--- a/src/sdl/sf_images.c
+++ b/src/sdl/sf_images.c
@@ -1,11 +1,11 @@
+#include "sf_frotz.h"
+
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "sf_frotz.h"
-
 #include <math.h>
 
 #include "png.h"
diff --git a/src/sdl/sf_osfdlg.c b/src/sdl/sf_osfdlg.c
index e4cc82a..f78bb9c 100644
--- a/src/sdl/sf_osfdlg.c
+++ b/src/sdl/sf_osfdlg.c
@@ -1,3 +1,5 @@
+#include "sf_frotz.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -8,8 +10,6 @@
 
 #define STATIC static
 
-#include "sf_frotz.h"
-
 typedef struct {
   void *left, *right;
   char *value;
diff --git a/src/sdl/sf_resource.c b/src/sdl/sf_resource.c
index 35b97bd..386cf31 100644
--- a/src/sdl/sf_resource.c
+++ b/src/sdl/sf_resource.c
@@ -1,3 +1,5 @@
+#include "sf_frotz.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -9,7 +11,6 @@
 
 #include <SDL.h>
 
-#include "sf_frotz.h"
 #include "../blorb/blorb.h"
 #include "../blorb/blorblow.h"
 
diff --git a/src/sdl/sf_sound.c b/src/sdl/sf_sound.c
index 9550252..9ebf6f4 100644
--- a/src/sdl/sf_sound.c
+++ b/src/sdl/sf_sound.c
@@ -1,3 +1,5 @@
+#include "sf_frotz.h"
+
 #include <stdarg.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -5,7 +7,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include "sf_frotz.h"
 #include "../blorb/blorblow.h"
 
 #include <SDL.h>
diff --git a/src/sdl/sf_util.c b/src/sdl/sf_util.c
index 9977850..741c7fd 100644
--- a/src/sdl/sf_util.c
+++ b/src/sdl/sf_util.c
@@ -1,3 +1,5 @@
+#include "sf_frotz.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -12,8 +14,6 @@
 #include <io.h>
 #endif
 
-#include "sf_frotz.h"
-
 f_setup_t f_setup;
 
 typedef void (*CLEANFUNC)();
diff --git a/src/sdl/sf_video.c b/src/sdl/sf_video.c
index ba4fa3f..d10782a 100644
--- a/src/sdl/sf_video.c
+++ b/src/sdl/sf_video.c
@@ -1,3 +1,5 @@
+#include "sf_frotz.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -9,8 +11,6 @@
 
 #include "generic.h"
 
-#include "sf_frotz.h"
-
 static char banner[256];
 static int isfullscreen;
 static ulong *sbuffer = NULL;
-- 
2.34.1