From f153ee93211871f9c7b408e1762917ce999d7516 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 25 May 2016 16:24:43 -0400 Subject: [PATCH] ndk_patches: Revert inline marker Does not work for pre-c99 mode. --- ndk_patches/stdio.h.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ndk_patches/stdio.h.patch b/ndk_patches/stdio.h.patch index 85d20302b..8dfed6041 100644 --- a/ndk_patches/stdio.h.patch +++ b/ndk_patches/stdio.h.patch @@ -37,7 +37,7 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl +#define __sferror(p) (((p)->_flags & __SERR) != 0) + +/* Used by perl, fish, and others */ -+static inline char* ctermid(char* s) { ++static char* ctermid(char* s) { + if (s == 0) return (char*) "/dev/tty"; + strcpy(s, "/dev/tty"); + return s; @@ -55,7 +55,7 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl +extern int open(const char*, int, ...); +extern pid_t getpid(); +extern int unlink(const char*); -+static inline FILE* tmpfile() { ++static FILE* tmpfile() { + int p = getpid(); + char* path; + int i;