X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/blobdiff_plain/59f0d218a6ff34c80cf898f6d7ac62555ba8eb11..9a5b4e1a0e7b1192bd42496cd901b671e77c61cd:/ndk_patches/stdio.h.patch

diff --git a/ndk_patches/stdio.h.patch b/ndk_patches/stdio.h.patch
index a91459fa..9155e0cc 100644
--- a/ndk_patches/stdio.h.patch
+++ b/ndk_patches/stdio.h.patch
@@ -1,7 +1,16 @@
 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
@@ -10,12 +19,19 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl
  #endif
  #define	L_tmpnam	1024	/* XXX must be == PATH_MAX */
  #define	TMP_MAX		308915776
-@@ -371,6 +371,9 @@
+@@ -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)
++
++/* Used by perl, fish, and others */
++static char* ctermid(char* s) {
++    if (s == 0) return "/dev/tty";
++    strcpy(s, "/dev/tty");
++    return s;
++}
 +
  #if defined(__BIONIC_FORTIFY)