commit 2beb83dd6258101a9796a8ed6f6a585530fff044
author Elliott Hughes <enh@google.com> Fri Apr 03 22:44:06 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 03 22:44:06 2015 +0000
tree 24e1084b7b3adc674f411467a38a7f5074110fe6
parent 11c84463eacc8ef2773910ea41b6b5918fafd9a2
parent 5432d3551d70d0cd3abe4bfb47cb9276477a419a

am 5432d355: am 7616909b: am 519751a8: Merge "There\'s no such thing as _THREAD_SAFE."

* commit '5432d3551d70d0cd3abe4bfb47cb9276477a419a':
  There's no such thing as _THREAD_SAFE.

core/combo/include/arch/darwin-x86/AndroidConfig.h

diff --git a/core/combo/include/arch/darwin-x86/AndroidConfig.h b/core/combo/include/arch/darwin-x86/AndroidConfig.h
index b4cc167..2673640 100644
--- a/core/combo/include/arch/darwin-x86/AndroidConfig.h
+++ b/core/combo/include/arch/darwin-x86/AndroidConfig.h
@@ -33,11 +33,6 @@
  */
 
 /*
- * Add any extra platform-specific defines here.
- */
-#define _THREAD_SAFE
-
-/*
  * Define if we have <malloc.h> header
  */
 /* #define HAVE_MALLOC_H */