From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 9 Mar 2011 17:39:28 +0000 (-0800)
Subject: * xterm.c (x_connection_closed): Tell GCC not to suggest NO_RETURN.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~605^2^2~20
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2a8fade06259290024cd7fe98fdeb8fd9709c90f;p=emacs.git

* xterm.c (x_connection_closed): Tell GCC not to suggest NO_RETURN.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 3381fa28aca..13f1715d3ae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -18,6 +18,7 @@
 	(x_error_quitter, xembed_send_message, x_iconify_frame):
 	(my_log_handler): Rename locals to avoid shadowing.
 	(x_delete_glyphs, x_ins_del_lines): Mark with NO_RETURN.
+	(x_connection_closed): Tell GCC not to suggest NO_RETURN.
 
 	* xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename
 	or move locals to avoid shadowing.
diff --git a/src/xterm.c b/src/xterm.c
index e218eb95285..abedf3b3bce 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7755,6 +7755,10 @@ For details, see etc/PROBLEMS.\n",
 
   unbind_to (idx, Qnil);
   clear_waiting_for_input ();
+
+  /* Tell GCC not to suggest attribute 'noreturn' for this function.  */
+  IF_LINT (if (! terminal_list) return; )
+
   /* Here, we absolutely have to use a non-local exit (e.g. signal, throw,
      longjmp), because returning from this function would get us back into
      Xlib's code which will directly call `exit'.  */