summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2014-02-02 15:12:37 +0100
committerSebastien Helleu <flashcode@flashtux.org>2014-02-02 15:12:37 +0100
commit6c47428e788906793692fb0efc8ceb25f7c4393e (patch)
treec8fb0b3d3e20b9b4675159a826336174e5753559
parentfcd120fa50ef737d17c94c197cdef06e683435a2 (diff)
downloadweechat-6c47428e788906793692fb0efc8ceb25f7c4393e.zip
core: fix compilation on Android (replace include of sys/termios.h by termios.h) (bug #41434)
-rw-r--r--ChangeLog3
-rw-r--r--src/gui/curses/gui-curses-window.c2
-rw-r--r--src/gui/curses/gui-curses.h4
3 files changed, 2 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 71c4dc85d..9a0d6ba5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,8 +11,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
== Version 0.4.3 (under dev)
-* core: fix compilation on Android (replace calls to rindex by strrchr)
- (bug #41420, patch #8301)
+* core: fix compilation on Android (bug #41420, patch #8301, bug #41434)
* core: fix crash when creating two bars with same name but different case
(bug #41418)
* core: fix display of read marker when all buffer lines are unread and that
diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c
index 2a640083c..f4444bf79 100644
--- a/src/gui/curses/gui-curses-window.c
+++ b/src/gui/curses/gui-curses-window.c
@@ -31,7 +31,7 @@
#include <stdarg.h>
#include <libgen.h>
#include <sys/ioctl.h>
-#include <sys/termios.h>
+#include <termios.h>
#include "../../core/weechat.h"
#include "../../core/wee-config.h"
diff --git a/src/gui/curses/gui-curses.h b/src/gui/curses/gui-curses.h
index cc03a5ccc..4b85c53e4 100644
--- a/src/gui/curses/gui-curses.h
+++ b/src/gui/curses/gui-curses.h
@@ -30,10 +30,6 @@
#include <curses.h>
#endif
-#ifdef __CYGWIN__
-#include <sys/termios.h>
-#endif
-
struct t_gui_buffer;
struct t_gui_window;
struct t_gui_bar_window;