From: Roland McGrath <roland@gnu.org>
Date: Mon, 14 Apr 2003 08:52:37 +0000 (+0000)
Subject: * sysdeps/generic/unwind-dw2.c (_Unwind_GetCFA): Add a cast to silence
X-Git-Tag: cvs/glibc-2_3_3~895
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8133a3fd7786cefedb07ba1d09f1c9e214fd94e0;p=thirdparty%2Fglibc.git

* 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 0c22f0f124e..9c86339f0d1 100644
--- 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 720034427d5..8e175466ab9 100644
--- 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.  */