From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Sun, 15 Sep 2013 07:48:25 +0000 (+0400)
Subject: * xterm.c, xfns.c (toplevel): Remove #ifdef HAVE_X_WINDOWS because
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1618
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7f09455e5807f0a2b14a313762f6b547490265d1;p=emacs.git

* xterm.c, xfns.c (toplevel): Remove #ifdef HAVE_X_WINDOWS because
these modules are never compiled otherwise.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 4040681f7ca..1e50b4391ba 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -9,6 +9,8 @@
 	* nsterm.h, w32term.h, xterm.h: ...and not here.
 	* w32term.h (SCROLL_BAR_X_WIDGET, SET_SCROLL_BAR_X_WIDGET):
 	Remove unused Xisms.
+	* xterm.c, xfns.c (toplevel): Remove #ifdef HAVE_X_WINDOWS because
+	these modules are never compiled otherwise.
 
 2013-09-14  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/xfns.c b/src/xfns.c
index ecd1ce7bc95..d455b2f21e4 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -42,8 +42,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "termchar.h"
 #include "font.h"
 
-#ifdef HAVE_X_WINDOWS
-
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -6186,5 +6184,3 @@ When using Gtk+ tooltips, the tooltip face is not used.  */);
   defsubr (&Sx_select_font);
 #endif
 }
-
-#endif /* HAVE_X_WINDOWS */
diff --git a/src/xterm.c b/src/xterm.c
index 60c2ecd1448..05766341cbc 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -23,8 +23,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <stdio.h>
 
-#ifdef HAVE_X_WINDOWS
-
 #include "lisp.h"
 #include "blockinput.h"
 #include "syssignal.h"
@@ -10865,5 +10863,3 @@ default is nil, which is the same as `super'.  */);
 				     make_float (DEFAULT_REHASH_THRESHOLD),
 				     Qnil);
 }
-
-#endif /* HAVE_X_WINDOWS */