* src/xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe.

diff --git a/src/ChangeLog b/src/ChangeLog
index 15da02b3e3d6dba1301b55233a3dbc0fdc2c5fd9..00bd97ae29e3cb3849a5aeea946e818d87f0c9fe 100644 (file)
--- 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 c7f7d036f9fbbad0b6dfb8d5b012a00eb24b2bb9..073889706409fe6a55c0aca0cd979d7f0908ad1f 100644 (file)
--- 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;