[Emacs-diffs] trunk r114291: * xterm.c, xfns.c (toplevel): Remove #ifdef HAVE_X_WINDOWS because

[Dmitry Antipov]

------------------------------------------------------------
revno: 114291
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Sun 2013-09-15 11:48:25 +0400
message:
  * xterm.c, xfns.c (toplevel): Remove #ifdef HAVE_X_WINDOWS because
  these modules are never compiled otherwise.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xfns.c                     xfns.c-20091113204419-o5vbwnq5f7feedwu-274
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-15 07:28:38 +0000
+++ b/src/ChangeLog     2013-09-15 07:48:25 +0000
@@ -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  <address@hidden>
 

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2013-09-13 16:46:18 +0000
+++ b/src/xfns.c        2013-09-15 07:48:25 +0000
@@ -42,8 +42,6 @@
 #include "termchar.h"
 #include "font.h"
 
-#ifdef HAVE_X_WINDOWS
-
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -6186,5 +6184,3 @@
   defsubr (&Sx_select_font);
 #endif
 }
-
-#endif /* HAVE_X_WINDOWS */

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2013-09-13 15:03:51 +0000
+++ b/src/xterm.c       2013-09-15 07:48:25 +0000
@@ -23,8 +23,6 @@
 #include <config.h>
 #include <stdio.h>
 
-#ifdef HAVE_X_WINDOWS
-
 #include "lisp.h"
 #include "blockinput.h"
 #include "syssignal.h"
@@ -10865,5 +10863,3 @@
                                     make_float (DEFAULT_REHASH_THRESHOLD),
                                     Qnil);
 }
-
-#endif /* HAVE_X_WINDOWS */