diff options
| author | Dmitry Antipov | 2013-09-15 11:48:25 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-09-15 11:48:25 +0400 |
| commit | 7f09455e5807f0a2b14a313762f6b547490265d1 (patch) | |
| tree | 9c319ee8967cb350b2b7681b4aaeb2dd1cc0f319 /src | |
| parent | 901049a6611e92b539e5fd2d661a9f0558a281dd (diff) | |
| download | emacs-7f09455e5807f0a2b14a313762f6b547490265d1.tar.gz emacs-7f09455e5807f0a2b14a313762f6b547490265d1.zip | |
* xterm.c, xfns.c (toplevel): Remove #ifdef HAVE_X_WINDOWS because
these modules are never compiled otherwise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xfns.c | 4 | ||||
| -rw-r--r-- | src/xterm.c | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4040681f7ca..1e50b4391ba 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -9,6 +9,8 @@ | |||
| 9 | * nsterm.h, w32term.h, xterm.h: ...and not here. | 9 | * nsterm.h, w32term.h, xterm.h: ...and not here. |
| 10 | * w32term.h (SCROLL_BAR_X_WIDGET, SET_SCROLL_BAR_X_WIDGET): | 10 | * w32term.h (SCROLL_BAR_X_WIDGET, SET_SCROLL_BAR_X_WIDGET): |
| 11 | Remove unused Xisms. | 11 | Remove unused Xisms. |
| 12 | * xterm.c, xfns.c (toplevel): Remove #ifdef HAVE_X_WINDOWS because | ||
| 13 | these modules are never compiled otherwise. | ||
| 12 | 14 | ||
| 13 | 2013-09-14 Eli Zaretskii <eliz@gnu.org> | 15 | 2013-09-14 Eli Zaretskii <eliz@gnu.org> |
| 14 | 16 | ||
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/>. */ | |||
| 42 | #include "termchar.h" | 42 | #include "termchar.h" |
| 43 | #include "font.h" | 43 | #include "font.h" |
| 44 | 44 | ||
| 45 | #ifdef HAVE_X_WINDOWS | ||
| 46 | |||
| 47 | #include <sys/types.h> | 45 | #include <sys/types.h> |
| 48 | #include <sys/stat.h> | 46 | #include <sys/stat.h> |
| 49 | 47 | ||
| @@ -6186,5 +6184,3 @@ When using Gtk+ tooltips, the tooltip face is not used. */); | |||
| 6186 | defsubr (&Sx_select_font); | 6184 | defsubr (&Sx_select_font); |
| 6187 | #endif | 6185 | #endif |
| 6188 | } | 6186 | } |
| 6189 | |||
| 6190 | #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/>. */ | |||
| 23 | #include <config.h> | 23 | #include <config.h> |
| 24 | #include <stdio.h> | 24 | #include <stdio.h> |
| 25 | 25 | ||
| 26 | #ifdef HAVE_X_WINDOWS | ||
| 27 | |||
| 28 | #include "lisp.h" | 26 | #include "lisp.h" |
| 29 | #include "blockinput.h" | 27 | #include "blockinput.h" |
| 30 | #include "syssignal.h" | 28 | #include "syssignal.h" |
| @@ -10865,5 +10863,3 @@ default is nil, which is the same as `super'. */); | |||
| 10865 | make_float (DEFAULT_REHASH_THRESHOLD), | 10863 | make_float (DEFAULT_REHASH_THRESHOLD), |
| 10866 | Qnil); | 10864 | Qnil); |
| 10867 | } | 10865 | } |
| 10868 | |||
| 10869 | #endif /* HAVE_X_WINDOWS */ | ||