diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 76ef0df3caf..73a9401b626 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-01  Roger Sayle  <roger@eyesopen.com>
+
+	* unwind-sjlj.c (_Unwind_GetCFA): Return (_Unwind_Word)0 instead
+	of NULL.
+
 2003-11-01  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	PR preprocessor/12847
diff --git a/gcc/unwind-sjlj.c b/gcc/unwind-sjlj.c
index a02fc325a78..505bb86dc5a 100644
--- a/gcc/unwind-sjlj.c
+++ b/gcc/unwind-sjlj.c
@@ -185,7 +185,7 @@ _Unwind_Word
 _Unwind_GetCFA (struct _Unwind_Context *context __attribute__((unused)))
 {
   /* ??? Ideally __builtin_setjmp places the CFA in the jmpbuf.  */
-  return NULL;
+  return (_Unwind_Word) 0;
 }
 
 void