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 #include -#ifdef HAVE_NCURSES_H -#include -#endif #ifdef HAVE_NCURSESW_NCURSES_H #include +#elif HAVE_NCURSES_H +#include #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 #include -#ifdef HAVE_NCURSES_H -#include -#endif + #ifdef HAVE_NCURSESW_NCURSES_H #include +#elif HAVE_NCURSES_H +#include #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 -#ifdef HAVE_NCURSES_H -#include -#endif #ifdef HAVE_NCURSESW_NCURSES_H #include +#elif HAVE_NCURSES_H +#include #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 #include -#ifdef HAVE_NCURSES_H -#include -#endif #ifdef HAVE_NCURSESW_NCURSES_H #include +#elif HAVE_NCURSES_H +#include #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 #include -#ifdef HAVE_NCURSES_H -#include -#endif + #ifdef HAVE_NCURSESW_NCURSES_H #include +#elif HAVE_NCURSES_H +#include #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 -#ifdef HAVE_NCURSES_H -#include -#endif #ifdef HAVE_NCURSESW_NCURSES_H #include +#elif HAVE_NCURSES_H +#include #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 -#ifdef HAVE_NCURSES_H -#include -#endif #ifdef HAVE_NCURSESW_NCURSES_H #include +#elif HAVE_NCURSES_H +#include #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 #include -#ifdef HAVE_NCURSES_H -#include -#endif + #ifdef HAVE_NCURSESW_NCURSES_H #include +#elif HAVE_NCURSES_H +#include #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 #endif -#ifdef HAVE_NCURSES_H -#include -#endif #ifdef HAVE_NCURSESW_NCURSES_H #include +#elif HAVE_NCURSES_H +#include #endif #include "chat_log.h"