commit 434545902581819cbe9df9bbeca007d7dfab1f1d
author Andrew Hsieh <andrewhsieh@google.com> Fri Nov 23 06:27:18 2012 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 23 06:27:19 2012 -0800
tree a2baac3ee95c5b8d2a2fc9489ea1613c57748ecc
parent 4e4ff7b6c6672d604ba9e670b6f024d2ad761ff2
parent 2173f48e90b2aad176daad37cd4c7bbb03d58874

Merge "[gabi++] Fix bug: incorrect parameter type."

sources/cxx-stl/gabi++/include/unwind-itanium.h

diff --git a/sources/cxx-stl/gabi++/include/unwind-itanium.h b/sources/cxx-stl/gabi++/include/unwind-itanium.h
index 5effb27..bd7a4b2 100644
--- a/sources/cxx-stl/gabi++/include/unwind-itanium.h
+++ b/sources/cxx-stl/gabi++/include/unwind-itanium.h
@@ -80,7 +80,7 @@
 void _Unwind_SetGR(struct _Unwind_Context*, int index, uint64_t new_value);
 
 uint64_t _Unwind_GetIP(struct _Unwind_Context*);
-void _Unwind_SetIP(struct _Unwind_Context*, uint64_t new_value);
+void _Unwind_SetIP(struct _Unwind_Context*, uintptr_t new_value);
 
 uint64_t _Unwind_GetRegionStart(struct _Unwind_Context*);
 uint64_t _Unwind_GetLanguageSpecificData(struct _Unwind_Context*);