merge in jb-mr2-release history after reset to master
diff --git a/include/cutils/properties.h b/include/cutils/properties.h
index f1461f2..25fd67a 100644
--- a/include/cutils/properties.h
+++ b/include/cutils/properties.h
@@ -17,8 +17,6 @@
#ifndef __CUTILS_PROPERTIES_H
#define __CUTILS_PROPERTIES_H
-#include <stddef.h>
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -64,26 +62,6 @@
};
#endif /*HAVE_SYSTEM_PROPERTY_SERVER*/
-#if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 && !defined(__MINGW32__) && !defined(__clang__)
-
-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))
-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) {
- __property_get_too_small_error();
- }
- return __property_get_real(key, value, default_value);
-}
-
-#endif /* defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 && !defined(__MINGW32__) && !defined(__clang__) */
#ifdef __cplusplus
}