diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-06 03:07:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-06 03:07:48 +0000 |
| commit | 260d400593154bea556eab8c72f4f35776040c5d (patch) | |
| tree | 14cf13557e87597e3f538336827ddf673a2c072a /debuggerd | |
| parent | 99be1a480e4f5a3e745545a97ebc44f09c982890 (diff) | |
| parent | b30b159f709a94a0fb1d62aa1ed7b0da8a51120d (diff) | |
| download | system_core-260d400593154bea556eab8c72f4f35776040c5d.zip system_core-260d400593154bea556eab8c72f4f35776040c5d.tar.gz system_core-260d400593154bea556eab8c72f4f35776040c5d.tar.bz2 | |
am b30b159f: am 61e92a02: am 68835ee8: Merge "system/core LP64 cleanup."
* commit 'b30b159f709a94a0fb1d62aa1ed7b0da8a51120d':
system/core LP64 cleanup.
Diffstat (limited to 'debuggerd')
| -rw-r--r-- | debuggerd/crasher.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debuggerd/crasher.c b/debuggerd/crasher.c index 0033948..5a2bc3c 100644 --- a/debuggerd/crasher.c +++ b/debuggerd/crasher.c @@ -57,13 +57,13 @@ static void test_call1() static void *noisy(void *x) { - char c = (unsigned) x; + char c = (uintptr_t) x; for(;;) { usleep(250*1000); write(2, &c, 1); if(c == 'C') *((unsigned*) 0) = 42; } - return 0; + return NULL; } static int ctest() @@ -81,7 +81,7 @@ static int ctest() static void* thread_callback(void* raw_arg) { - return (void*) do_action((const char*) raw_arg); + return (void*) (uintptr_t) do_action((const char*) raw_arg); } static int do_action_on_thread(const char* arg) @@ -90,7 +90,7 @@ static int do_action_on_thread(const char* arg) pthread_create(&t, NULL, thread_callback, (void*) arg); void* result = NULL; pthread_join(t, &result); - return (int) result; + return (int) (uintptr_t) result; } __attribute__((noinline)) static int crash3(int a) { |