stdio.h: Avoid pulling in complete fcntl.h

This pollutes the namespace and breaks building e.g. python, which
defines a tee() function.

diff --git a/ndk_patches/stdio.h.patch b/ndk_patches/stdio.h.patch
index 600c79e1a16f5598e9b2192f8b4e06821e3d58e4..c64fda15602331ac02862c665403fa1893ee8ea7 100644 (file)
--- a/ndk_patches/stdio.h.patch
+++ b/ndk_patches/stdio.h.patch
@@ -6,7 +6,7 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl
  #include <stddef.h>
  
 +#include <string.h>           /* For strcpy(3) used by ctermid() */
  #include <stddef.h>
  
 +#include <string.h>           /* For strcpy(3) used by ctermid() */

-+#include <fcntl.h>             /* For O_RDWR and other O_* constants */
++#include <asm-generic/fcntl.h> /* For O_RDWR and other O_* constants */

 +#include <stdlib.h>            /* For arc4random() */
 +
  #define __need_NULL
 +#include <stdlib.h>            /* For arc4random() */
 +
  #define __need_NULL


@@ -46,12 +46,15 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl
  #if defined(__BIONIC_FORTIFY)
  
  __BEGIN_DECLS
  #if defined(__BIONIC_FORTIFY)
  
  __BEGIN_DECLS

-@@ -462,4 +474,26 @@
+@@ -462,4 +474,29 @@

  
  #endif /* defined(__BIONIC_FORTIFY) */
  
 +__BEGIN_DECLS
 +
  
  #endif /* defined(__BIONIC_FORTIFY) */
  
 +__BEGIN_DECLS
 +

++extern int open(const char*, int, ...);
++extern pid_t getpid();
++extern int unlink(const char*);

 +static FILE* tmpfile() {
 +      int p = getpid();
 +      char* path;
 +static FILE* tmpfile() {
 +      int p = getpid();
 +      char* path;