diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 00:40:50 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 14:38:19 +0000 |
| commit | 6cfec1a5b66fe113ffbe81c125ea700f21b30439 (patch) | |
| tree | a1753b317adea2c440b98cb8854a0ee152f8bcb0 /tests/stack_unwinding_test.cpp | |
| parent | e2f0539dee416d6770493a0d90e1bdffa874acf1 (diff) | |
| parent | 7ed993ad49ebcb0c702f000978f42f52e9f423ab (diff) | |
| download | android_bionic-6cfec1a5b66fe113ffbe81c125ea700f21b30439.tar.gz android_bionic-6cfec1a5b66fe113ffbe81c125ea700f21b30439.tar.bz2 android_bionic-6cfec1a5b66fe113ffbe81c125ea700f21b30439.zip | |
Merge tag 'android-6.0.0_r26' into cm-13.0
Android 6.0.0 release 26
Change-Id: Ic73500c2330af39a735307c153fbe3e71b7f2040
Diffstat (limited to 'tests/stack_unwinding_test.cpp')
| -rw-r--r-- | tests/stack_unwinding_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/stack_unwinding_test.cpp b/tests/stack_unwinding_test.cpp index d1b3402cd..afd9e7f0e 100644 --- a/tests/stack_unwinding_test.cpp +++ b/tests/stack_unwinding_test.cpp @@ -34,7 +34,7 @@ #define noinline __attribute__((__noinline__)) #define __unused __attribute__((__unused__)) -static _Unwind_Reason_Code FrameCounter(_Unwind_Context* ctx __unused, void* arg) { +_Unwind_Reason_Code FrameCounter(_Unwind_Context* ctx __unused, void* arg) { int* count_ptr = reinterpret_cast<int*>(arg); #if SHOW_FRAME_LOCATIONS |