From fe8ce5419da5f08e0923e759753b75edc53906b3 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Mon, 29 Jan 2018 21:01:03 +0100
Subject: Include system headers before local ones to fix type conflict on
 OpenBSD

---
 src/feh_png.c   | 4 ++--
 src/feh_png.h   | 4 ++--
 src/gib_hash.c  | 2 +-
 src/options.c   | 3 ++-
 src/wallpaper.c | 6 ++++--
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/feh_png.c b/src/feh_png.c
index d27df01..d0c1c8a 100644
--- a/src/feh_png.c
+++ b/src/feh_png.c
@@ -23,13 +23,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
-#include "feh_png.h"
-
 #include <png.h>
 
 #include <stdio.h>
 #include <stdarg.h>
 
+#include "feh_png.h"
+
 #define FEH_PNG_COMPRESSION 3
 #define FEH_PNG_NUM_COMMENTS 4
 
diff --git a/src/feh_png.h b/src/feh_png.h
index ac3375f..035d36a 100644
--- a/src/feh_png.h
+++ b/src/feh_png.h
@@ -26,11 +26,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef FEH_PNG_H
 #define FEH_PNG_H
 
-#include "feh.h"
-
 #include <stdio.h>
 #include <stdarg.h>
 
+#include "feh.h"
+
 gib_hash *feh_png_read_comments(char *file);
 int feh_png_write_png_fd(Imlib_Image image, int fd, ...);
 
diff --git a/src/gib_hash.c b/src/gib_hash.c
index 15bbf4a..0d6a226 100644
--- a/src/gib_hash.c
+++ b/src/gib_hash.c
@@ -22,11 +22,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
+#include <strings.h>
 
 #include "gib_hash.h"
 #include "utils.h"
 #include "debug.h"
-#include <strings.h>
 
 gib_hash_node *gib_hash_node_new(char *key, void *data)
 {
diff --git a/src/options.c b/src/options.c
index c874832..837d7a8 100644
--- a/src/options.c
+++ b/src/options.c
@@ -24,10 +24,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
+#include <strings.h>
+
 #include "feh.h"
 #include "filelist.h"
 #include "options.h"
-#include <strings.h>
 
 static void check_options(void);
 static void feh_getopt_theme(int argc, char **argv);
diff --git a/src/wallpaper.c b/src/wallpaper.c
index c9a3a05..34694ae 100644
--- a/src/wallpaper.c
+++ b/src/wallpaper.c
@@ -24,12 +24,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
+#include <limits.h>
+#include <sys/stat.h>
+
 #include "feh.h"
 #include "filelist.h"
 #include "options.h"
 #include "wallpaper.h"
-#include <limits.h>
-#include <sys/stat.h>
+
 Window ipc_win = None;
 Window my_ipc_win = None;
 Atom ipc_atom = None;
-- 
cgit v1.2.3