commit f99509b3b0a5a151a52abf196427f618f161b11c
author Elliott Hughes <enh@google.com> Wed Jul 29 22:11:42 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 29 22:11:42 2015 +0000
tree 33ed4e6716fced11a13e81d4613c084f2434c6ea
parent 2d015e56bd40520a2118d2d10d576f7d04172d82
parent 8d459eef2f5a5abda65d8f4c2f6b29c90cd05858

am fc2f1e61: Merge "Move libutils off AndroidConfig.h."

* commit 'fc2f1e61146627e387b8273981914dd5bc059317':
  Move libutils off AndroidConfig.h.

include/utils/Compat.h

diff --git a/include/utils/Compat.h b/include/utils/Compat.h
index 7d96310..c5f9d6a 100644
--- a/include/utils/Compat.h
+++ b/include/utils/Compat.h
@@ -75,4 +75,10 @@
     _rc; })
 #endif
 
+#if defined(_WIN32)
+#define OS_PATH_SEPARATOR '\\'
+#else
+#define OS_PATH_SEPARATOR '/'
+#endif
+
 #endif /* __LIB_UTILS_COMPAT_H */

libutils/String8.cpp

diff --git a/libutils/String8.cpp b/libutils/String8.cpp
index 3323b82..28be60f 100644
--- a/libutils/String8.cpp
+++ b/libutils/String8.cpp
@@ -16,6 +16,7 @@
 
 #include <utils/String8.h>
 
+#include <utils/Compat.h>
 #include <utils/Log.h>
 #include <utils/Unicode.h>
 #include <utils/SharedBuffer.h>