* sysdeps/generic/unwind-dw2.c (_Unwind_GetCFA): Add a cast to silence

	compiler warning.

	* sysdeps/generic/unwind-pe.h: Fix decl hacks broken in merge.

diff --git a/ChangeLog b/ChangeLog
index 0c22f0f..9c86339 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-14  Roland McGrath  <roland@redhat.com>
+
+       * sysdeps/generic/unwind-dw2.c (_Unwind_GetCFA): Add a cast to silence
+       compiler warning.
+
+       * sysdeps/generic/unwind-pe.h: Fix decl hacks broken in merge.
+
 2003-04-14  Ulrich Drepper  <drepper@redhat.com>
 
        * string/strxfrm.c (STRXFRM): Terminate rulearr at correct

diff --git a/sysdeps/generic/unwind-dw2.c b/sysdeps/generic/unwind-dw2.c
index 7200344..8e17546 100644 (file)
--- a/sysdeps/generic/unwind-dw2.c
+++ b/sysdeps/generic/unwind-dw2.c
@@ -184,7 +184,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
 _Unwind_Word
 _Unwind_GetCFA (struct _Unwind_Context *context)
 {
-  return context->cfa;
+  return (_Unwind_Word) context->cfa;
 }
 
 /* Overwrite the saved value for register REG in CONTEXT with VAL.  */