From 57f9e43566769cd76dea14c52f07cc5789eb22db Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Fri, 4 Jan 2013 00:35:54 +0000
Subject: [PATCH] Fixed order of includes for ncursesw

Arch linux uses the standard headers for wide char ncurses
---
 src/input_win.c   | 5 ++---
 src/preferences.c | 6 +++---
 src/preferences.h | 5 ++---
 src/status_bar.c  | 5 ++---
 src/theme.c       | 6 +++---
 src/theme.h       | 5 ++---
 src/ui.h          | 5 ++---
 src/window.c      | 6 +++---
 src/windows.c     | 5 ++---
 9 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/src/input_win.c b/src/input_win.c
index dadbd068..b731b978 100644
--- a/src/input_win.c
+++ b/src/input_win.c
@@ -45,11 +45,10 @@
 #include <string.h>
 #include <wchar.h>
 
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#endif
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
+#elif HAVE_NCURSES_H
+#include <ncurses.h>
 #endif
 
 #include "common.h"
diff --git a/src/preferences.c b/src/preferences.c
index 8ef67b58..8c9b7918 100644
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -24,11 +24,11 @@
 #include <string.h>
 
 #include <glib.h>
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#endif
+
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
+#elif HAVE_NCURSES_H
+#include <ncurses.h>
 #endif
 
 #include "config.h"
diff --git a/src/preferences.h b/src/preferences.h
index 77f1b7d0..b40886ec 100644
--- a/src/preferences.h
+++ b/src/preferences.h
@@ -27,11 +27,10 @@
 
 #include <glib.h>
 
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#endif
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
+#elif HAVE_NCURSES_H
+#include <ncurses.h>
 #endif
 
 #define PREFS_MIN_LOG_SIZE 64
diff --git a/src/status_bar.c b/src/status_bar.c
index 4f8db3a6..8e748f45 100644
--- a/src/status_bar.c
+++ b/src/status_bar.c
@@ -25,11 +25,10 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#endif
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
+#elif HAVE_NCURSES_H
+#include <ncurses.h>
 #endif
 
 #include "theme.h"
diff --git a/src/theme.c b/src/theme.c
index 97774d61..d7cba826 100644
--- a/src/theme.c
+++ b/src/theme.c
@@ -26,11 +26,11 @@
 #include <string.h>
 
 #include <glib.h>
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#endif
+
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
+#elif HAVE_NCURSES_H
+#include <ncurses.h>
 #endif
 
 #include "files.h"
diff --git a/src/theme.h b/src/theme.h
index c11cec29..bda74726 100644
--- a/src/theme.h
+++ b/src/theme.h
@@ -27,11 +27,10 @@
 
 #include <glib.h>
 
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#endif
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
+#elif HAVE_NCURSES_H
+#include <ncurses.h>
 #endif
 
 #define COLOUR_TEXT             COLOR_PAIR(1)
diff --git a/src/ui.h b/src/ui.h
index 556761d0..ea0f7618 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -29,11 +29,10 @@
 
 #include <glib.h>
 
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#endif
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
+#elif HAVE_NCURSES_H
+#include <ncurses.h>
 #endif
 
 #include "jabber.h"
diff --git a/src/window.c b/src/window.c
index 75b905ab..85cb1f06 100644
--- a/src/window.c
+++ b/src/window.c
@@ -26,11 +26,11 @@
 #include <string.h>
 
 #include <glib.h>
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#endif
+
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
+#elif HAVE_NCURSES_H
+#include <ncurses.h>
 #endif
 
 #include "theme.h"
diff --git a/src/windows.c b/src/windows.c
index a52ac2e8..b8b12f59 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -38,11 +38,10 @@
 #include <windows.h>
 #endif
 
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#endif
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
+#elif HAVE_NCURSES_H
+#include <ncurses.h>
 #endif
 
 #include "chat_log.h"