[[[
Include termios.h to get struct winsize declared when building with
the Android NDK.
* subversion/svn/file-merge.c: Include termios.h to fix Android build.
]]]
Index: subversion/svn/file-merge.c
===================================================================
--- subversion/svn/file-merge.c (revision 1598887)
+++ subversion/svn/file-merge.c (working copy)
@@ -50,6 +50,7 @@
#include <fcntl.h>
#include <stdlib.h>
+#include <termios.h>
/* Baton for functions in this file which implement svn_diff_output_fns_t. */
struct file_merge_baton {
