diff options
| author | Nick Kralevich <nnk@google.com> | 2013-02-04 09:48:44 -0800 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2013-02-04 09:48:54 -0800 |
| commit | 91e63efeef3c87748e3618f7b46af520e54da128 (patch) | |
| tree | 5d435482d475e09ab7994043135a3a6b620ccdfe /include | |
| parent | 941daef629bd571032851edf7ae1dce24266640e (diff) | |
| download | system_core-91e63efeef3c87748e3618f7b46af520e54da128.zip system_core-91e63efeef3c87748e3618f7b46af520e54da128.tar.gz system_core-91e63efeef3c87748e3618f7b46af520e54da128.tar.bz2 | |
Revert "Fix win_sdk build."
This reverts commit 941daef629bd571032851edf7ae1dce24266640e.
Change-Id: I6b509492964baf535e0eeb1a731bf70c91715942
Diffstat (limited to 'include')
| -rw-r--r-- | include/cutils/properties.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/cutils/properties.h b/include/cutils/properties.h index f1461f2..5ec8c2c 100644 --- a/include/cutils/properties.h +++ b/include/cutils/properties.h @@ -17,6 +17,7 @@ #ifndef __CUTILS_PROPERTIES_H #define __CUTILS_PROPERTIES_H +#include <sys/cdefs.h> #include <stddef.h> #ifdef __cplusplus @@ -64,17 +65,14 @@ enum { }; #endif /*HAVE_SYSTEM_PROPERTY_SERVER*/ -#if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 && !defined(__MINGW32__) && !defined(__clang__) +#ifdef __BIONIC_FORTIFY_INLINE extern int __property_get_real(const char *, char *, const char *) __asm__(__USER_LABEL_PREFIX__ "property_get"); extern void __property_get_too_small_error() __attribute__((__error__("property_get() called with too small of a buffer"))); -extern inline -__attribute__ ((always_inline)) -__attribute__ ((gnu_inline)) -__attribute__ ((artificial)) +__BIONIC_FORTIFY_INLINE int property_get(const char *key, char *value, const char *default_value) { size_t bos = __builtin_object_size(value, 0); if (bos < PROPERTY_VALUE_MAX) { @@ -83,7 +81,7 @@ int property_get(const char *key, char *value, const char *default_value) { return __property_get_real(key, value, default_value); } -#endif /* defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 && !defined(__MINGW32__) && !defined(__clang__) */ +#endif /* __BIONIC_FORTIFY_INLINE */ #ifdef __cplusplus } |