* 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 4040681f7ca69258a462051b57a7edee5cb1311e..1e50b4391ba73271e4c6830b0689c0cf5d9627c1 100644 (file)
--- 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 ecd1ce7bc951da221da859afa4cc44b9a1aec0db..d455b2f21e4182e4fd529f63e5bdedf3799ec51c 100644 (file)
--- 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 60c2ecd144822fd8dae2187588f365e93787d680..05766341cbc98f17cab3d0fae988c1f47455f111 100644 (file)
--- 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 */