aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDmitry Antipov2013-10-02 15:49:24 +0400
committerDmitry Antipov2013-10-02 15:49:24 +0400
commita30ddace90fb8921b2c40cdaf96e5af37d288f01 (patch)
treea05bd0a604c16603792532d546ebae957d8f3273 /src
parent45435f08570d581a4126febe4fb8589d8e3ea959 (diff)
downloademacs-a30ddace90fb8921b2c40cdaf96e5af37d288f01.tar.gz
emacs-a30ddace90fb8921b2c40cdaf96e5af37d288f01.zip
* fringe.c (toplevel): Do not use HAVE_WINDOW_SYSTEM because
this module is never compiled otherwise.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/fringe.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2274071a902..14519f874d2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-10-02 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * fringe.c (toplevel): Do not use HAVE_WINDOW_SYSTEM because
4 this module is never compiled otherwise.
5
12013-10-01 Alp Aker <alp.tekin.aker@gmail.com> 62013-10-01 Alp Aker <alp.tekin.aker@gmail.com>
2 7
3 * macfont.m (macfont_draw): Use CGRectMake rather than NSMakeRect 8 * macfont.m (macfont_draw): Use CGRectMake rather than NSMakeRect
diff --git a/src/fringe.c b/src/fringe.c
index 492eddae8d4..85103f7f08d 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -29,8 +29,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
29#include "blockinput.h" 29#include "blockinput.h"
30#include "termhooks.h" 30#include "termhooks.h"
31 31
32#ifdef HAVE_WINDOW_SYSTEM
33
34/* Fringe bitmaps are represented in three different ways: 32/* Fringe bitmaps are represented in three different ways:
35 33
36 Logical bitmaps are used internally to denote things like 34 Logical bitmaps are used internally to denote things like
@@ -1863,5 +1861,3 @@ w32_reset_fringes (void)
1863} 1861}
1864 1862
1865#endif /* HAVE_NTGUI */ 1863#endif /* HAVE_NTGUI */
1866
1867#endif /* HAVE_WINDOW_SYSTEM */