commit e44d25d64537f4ea2abcb56aabc7a5bf0731c222
author Elliott Hughes <enh@google.com> Tue Feb 03 23:23:10 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 03 23:23:11 2015 +0000
tree 50bfddec34e57646999e9b6cc176686f42d01fbc
parent d4a6fc5bc205d516e5bf05cafc5b6eadb4e0b372
parent 6b3be2902dcfe6d6ebfea52c54fec182273a0138

Merge "Add Google-style StringPrintf."

include/utils/Compat.h

diff --git a/include/utils/Compat.h b/include/utils/Compat.h
index 0df40a1..a238afe 100644
--- a/include/utils/Compat.h
+++ b/include/utils/Compat.h
@@ -35,6 +35,12 @@
 
 #endif /* __APPLE__ */
 
+#if defined(_WIN32)
+#define O_CLOEXEC 0
+#define O_NOFOLLOW 0
+#define DEFFILEMODE 0666
+#endif /* _WIN32 */
+
 #if HAVE_PRINTF_ZD
 #  define ZD "%zd"
 #  define ZD_TYPE ssize_t

init/property_service.h

diff --git a/init/property_service.h b/init/property_service.h
index 730495e..ff8b063 100644
--- a/init/property_service.h
+++ b/init/property_service.h
@@ -32,13 +32,19 @@
 extern int properties_inited();
 int get_property_set_fd(void);
 
+#ifndef __clang__
 extern void __property_get_size_error()
     __attribute__((__error__("property_get called with too small buffer")));
+#else
+extern void __property_get_size_error();
+#endif
 
 static inline
 __attribute__ ((always_inline))
 __attribute__ ((gnu_inline))
+#ifndef __clang__
 __attribute__ ((artificial))
+#endif
 int property_get(const char *name, char *value)
 {
     size_t value_len = __builtin_object_size(value, 0);