diff options
| author | Calin Juravle <calin@google.com> | 2014-05-22 13:28:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-22 13:28:52 +0000 |
| commit | 254fa8857f5d88a4140cea2ee05056eae7f102b1 (patch) | |
| tree | d7dc6582135b8faf842fc9223fd2af8ad792d4ed /libc/include | |
| parent | 3eb9f1f6bade8085520d9b0ec35d84d69563ebe1 (diff) | |
| parent | fcac8ff97f6b6cced6546e0096cadc1039b68b5e (diff) | |
| download | bionic-254fa8857f5d88a4140cea2ee05056eae7f102b1.zip bionic-254fa8857f5d88a4140cea2ee05056eae7f102b1.tar.gz bionic-254fa8857f5d88a4140cea2ee05056eae7f102b1.tar.bz2 | |
Merge "Switch to POSIX dprintf/vdprintf."
Diffstat (limited to 'libc/include')
| -rw-r--r-- | libc/include/stdio.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/libc/include/stdio.h b/libc/include/stdio.h index 470d377..90f595c 100644 --- a/libc/include/stdio.h +++ b/libc/include/stdio.h @@ -250,6 +250,9 @@ int vfprintf(FILE * __restrict, const char * __restrict, __va_list) int vprintf(const char * __restrict, __va_list) __printflike(1, 0); +int dprintf(int, const char * __restrict, ...) __printflike(2, 3); +int vdprintf(int, const char * __restrict, __va_list) __printflike(2, 0); + #ifndef __AUDIT__ char* gets(char*) __warnattr("gets is very unsafe; consider using fgets"); int sprintf(char* __restrict, const char* __restrict, ...) @@ -359,21 +362,6 @@ __END_DECLS #define fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0) #endif /* __BSD_VISIBLE */ -#ifdef _GNU_SOURCE -/* - * glibc defines dprintf(int, const char*, ...), which is poorly named - * and likely to conflict with locally defined debugging printfs - * fdprintf is a better name, and some programs that use fdprintf use a - * #define fdprintf dprintf for compatibility - */ -__BEGIN_DECLS -int fdprintf(int, const char*, ...) - __printflike(2, 3); -int vfdprintf(int, const char*, __va_list) - __printflike(2, 0); -__END_DECLS -#endif /* _GNU_SOURCE */ - #if defined(__BIONIC_FORTIFY) __BEGIN_DECLS |