Author: stefan2
Date: Mon Jun 2 09:15:56 2014
New Revision: 1599135
URL: http://svn.apache.org/r1599135
Log:
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.
Patch by: Fredrik Fornwall (fredrik at fornwall net)
Modified:
subversion/trunk/subversion/svn/file-merge.c
Modified: subversion/trunk/subversion/svn/file-merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/file-merge.c?rev=1599135&r1=1599134&r2=1599135&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/file-merge.c (original)
+++ subversion/trunk/subversion/svn/file-merge.c Mon Jun 2 09:15:56 2014
@@ -51,6 +51,10 @@
#include <fcntl.h>
#include <stdlib.h>
+#if defined(HAVE_TERMIOS_H)
+#include <termios.h>
+#endif
+
/* Baton for functions in this file which implement svn_diff_output_fns_t. */
struct file_merge_baton {
/* The files being merged. */
