diff options
| author | JP Abgrall <jpa@google.com> | 2011-02-23 18:44:39 -0800 |
|---|---|---|
| committer | JP Abgrall <jpa@google.com> | 2011-02-23 18:49:00 -0800 |
| commit | 0e7c4274c687446dbe30a814278d7a6b99da8c4e (patch) | |
| tree | 1a186c36a574be64b986179f3504f9aebec99281 /adb/sysdeps.h | |
| parent | 1e0582eba6cb07aa9311602dbed7d13bbab84588 (diff) | |
| download | system_core-0e7c4274c687446dbe30a814278d7a6b99da8c4e.tar.gz system_core-0e7c4274c687446dbe30a814278d7a6b99da8c4e.tar.bz2 system_core-0e7c4274c687446dbe30a814278d7a6b99da8c4e.zip | |
Revert "Fix adb hang when subprocess dies early."
This is for http://b/3482112 "adb interactions with device causing test harness failures".
This reverts commit 69c5c4c45bd4f1575ae8bdba13795297be7deb8c.
Change-Id: I630bf2e04d2ecf0223bd2af4e87136754ff880d3
Diffstat (limited to 'adb/sysdeps.h')
| -rw-r--r-- | adb/sysdeps.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/adb/sysdeps.h b/adb/sysdeps.h index 3a65a8a7..74f4ed1c 100644 --- a/adb/sysdeps.h +++ b/adb/sysdeps.h @@ -103,7 +103,7 @@ static __inline__ int adb_unlink(const char* path) static __inline__ int adb_mkdir(const char* path, int mode) { - return _mkdir(path); + return _mkdir(path); } #undef mkdir #define mkdir ___xxx_mkdir @@ -274,18 +274,13 @@ static __inline__ int adb_is_absolute_host_path( const char* path ) #define OS_PATH_SEPARATOR_STR "/" typedef pthread_mutex_t adb_mutex_t; - -/* declare all mutexes */ -#define ADB_MUTEX(x) extern adb_mutex_t x; -#include "mutex_list.h" - #define ADB_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER #define adb_mutex_init pthread_mutex_init #define adb_mutex_lock pthread_mutex_lock #define adb_mutex_unlock pthread_mutex_unlock #define adb_mutex_destroy pthread_mutex_destroy -#define ADB_MUTEX_DEFINE(m) adb_mutex_t m = PTHREAD_MUTEX_INITIALIZER +#define ADB_MUTEX_DEFINE(m) static adb_mutex_t m = PTHREAD_MUTEX_INITIALIZER #define adb_cond_t pthread_cond_t #define adb_cond_init pthread_cond_init |