From 9867ff1acad95abe867ca53a2607c2ffaf515e41 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 24 Dec 2015 03:20:05 -0500
Subject: [PATCH] Include <string.h> in <stdio.h> for ctermid()

---
 ndk_patches/stdio.h.patch | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/ndk_patches/stdio.h.patch b/ndk_patches/stdio.h.patch
index 630c4c900..2b92fae8d 100644
--- a/ndk_patches/stdio.h.patch
+++ b/ndk_patches/stdio.h.patch
@@ -1,19 +1,28 @@
 diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/stdio.h ./usr/include/stdio.h
 --- /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/stdio.h	2014-10-14 22:53:49.000000000 -0400
-+++ ./usr/include/stdio.h	2014-12-14 15:11:46.007242332 -0500
-@@ -193,7 +193,7 @@
-
++++ ./usr/include/stdio.h	2015-12-24 03:07:45.028840214 -0500
+@@ -52,6 +52,8 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ 
++#include <string.h>		/* For strcpy(3) used by ctermid() */
++
+ #define __need_NULL
+ #include <stddef.h>
+ 
+@@ -193,7 +195,7 @@
+ 
  /* System V/ANSI C; this is the wrong way to do this, do *not* use these. */
  #if __BSD_VISIBLE || __XPG_VISIBLE
 -#define	P_tmpdir	"/tmp/"
-+#define	P_tmpdir	"@TERMUX_PREFIX@/tmp/"
++#define	P_tmpdir	"/data/data/com.termux/files/usr/tmp/"
  #endif
  #define	L_tmpnam	1024	/* XXX must be == PATH_MAX */
  #define	TMP_MAX		308915776
-@@ -371,6 +371,16 @@
+@@ -371,6 +373,16 @@
  #define	fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0)
  #endif /* __BSD_VISIBLE */
-
+ 
 +/* Needed by gnulibs freading() */
 +#define __sferror(p)    (((p)->_flags & __SERR) != 0)
 +
@@ -25,5 +34,5 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl
 +}
 +
  #if defined(__BIONIC_FORTIFY)
-
+ 
  __BEGIN_DECLS