2 files changed, 6 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f4a15df66ba..5d6eb0a435b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-16  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * data.c (arith_error): Mark with NO_RETURN if it doesn't return.
+
         * alloc.c (bytes_used_when_full, SPARE_MEMORY, BYTES_USED):
         Define only if needed.
 
diff --git a/src/data.c b/src/data.c
index 956ff3700f2..c9250a67bf0 100644
--- a/src/data.c
+++ b/src/data.c
@@ -3305,6 +3305,10 @@ syms_of_data (void)
   XSYMBOL (intern_c_string ("most-negative-fixnum"))->constant = 1;
 }
 
+#ifndef FORWARD_SIGNAL_TO_MAIN_THREAD
+static void arith_error (int) NO_RETURN;
+#endif
+
 static void
 arith_error (int signo)
 {