2 files changed, 2 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 15da02b3e3d..00bd97ae29e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2010-10-31  Glenn Morris  <rgm@gnu.org>
 
+        * xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe.
+
         * frame.c (syms_of_frame) <tool-bar-mode>:
         Default to nil if !HAVE_WINDOW_SYSTEM.  (Bug#7299)
 
diff --git a/src/xterm.c b/src/xterm.c
index c7f7d036f9f..07388970640 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7689,7 +7689,6 @@ x_connection_closed (Display *dpy, const char *error_message)
          Closing the display is reported to lead to a bus error on
          OpenWindows in certain situations.  I suspect that is a bug
          in OpenWindows.  I don't know how to circumvent it here.  */
-      extern void (*fatal_error_signal_hook) P_ ((void));
       fatal_error_signal_hook = x_fatal_error_signal;
       XtCloseDisplay (dpy);
       fatal_error_signal_hook = NULL;