generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am aefe43b1: am 95c1abec: Merge "FORTIFY_SOURCE: don\'t define s?printf macros if already defined"

Browse Source 
* commit 'aefe43b1824907b93c6280ce27cb2c105c564477':
  FORTIFY_SOURCE: don't define s?printf macros if already defined
This commit is contained in:
Nick Kralevich 2014-03-24 21:25:17 +00:00 committed by Android Git Automerger
commit 91ef8d53ec
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libc/include/stdio.h
View File

@ -393,8 +393,10 @@ int vsprintf(char *dest, const char *format, __va_list ap)
} }
#if defined(__clang__) #if defined(__clang__)
#if !defined(snprintf)
#define __wrap_snprintf(dest, size, ...) __builtin___snprintf_chk(dest, size, 0, __bos(dest), __VA_ARGS__) #define __wrap_snprintf(dest, size, ...) __builtin___snprintf_chk(dest, size, 0, __bos(dest), __VA_ARGS__)
#define snprintf(...) __wrap_snprintf(__VA_ARGS__) #define snprintf(...) __wrap_snprintf(__VA_ARGS__)
#endif
#else #else
__BIONIC_FORTIFY_INLINE __BIONIC_FORTIFY_INLINE
__printflike(3, 4) __printflike(3, 4)
@ -406,8 +408,10 @@ int snprintf(char *dest, size_t size, const char *format, ...)
#endif #endif
#if defined(__clang__) #if defined(__clang__)
#if !defined(sprintf)
#define __wrap_sprintf(dest, ...) __builtin___sprintf_chk(dest, 0, __bos(dest), __VA_ARGS__) #define __wrap_sprintf(dest, ...) __builtin___sprintf_chk(dest, 0, __bos(dest), __VA_ARGS__)
#define sprintf(...) __wrap_sprintf(__VA_ARGS__) #define sprintf(...) __wrap_sprintf(__VA_ARGS__)
#endif
#else #else
__BIONIC_FORTIFY_INLINE __BIONIC_FORTIFY_INLINE
__printflike(2, 3) __printflike(2, 3)