stdio.h: Avoid pulling in complete fcntl.h
authorFredrik Fornwall <fredrik@fornwall.net>
Mon, 11 Apr 2016 13:15:57 +0000 (09:15 -0400)
committerFredrik Fornwall <fredrik@fornwall.net>
Mon, 11 Apr 2016 13:15:57 +0000 (09:15 -0400)
This pollutes the namespace and breaks building e.g. python, which
defines a tee() function.

ndk_patches/stdio.h.patch

index 600c79e..c64fda1 100644 (file)
@@ -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 <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
@@ -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
-@@ -462,4 +474,26 @@
+@@ -462,4 +474,29 @@
  
  #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;