aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDmitry Antipov2013-09-03 16:41:35 +0400
committerDmitry Antipov2013-09-03 16:41:35 +0400
commitec5e75040267c92ebd01fed9d185ff7fdd7d31a3 (patch)
treef323041ee96319a5528d9ca2d3afeabcfbe309a9 /src
parentd1ae6a0bca4368d17a031c6339f0ba52b5a958d3 (diff)
downloademacs-ec5e75040267c92ebd01fed9d185ff7fdd7d31a3.tar.gz
emacs-ec5e75040267c92ebd01fed9d185ff7fdd7d31a3.zip
* xfns.c, image.c (XLIB_ILLEGAL_ACCESS): No longer needed.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/image.c5
-rw-r--r--src/xfns.c4
3 files changed, 1 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 387a2883adb..18c867f7b6d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -11,6 +11,7 @@
11 (x_scroll_bar_set_handle, XTset_vertical_scroll_bar) 11 (x_scroll_bar_set_handle, XTset_vertical_scroll_bar)
12 (x_scroll_bar_handle_click, x_scroll_bar_note_movement) 12 (x_scroll_bar_handle_click, x_scroll_bar_note_movement)
13 (x_scroll_bar_report_motion, x_set_offset): Related users changed. 13 (x_scroll_bar_report_motion, x_set_offset): Related users changed.
14 * xfns.c, image.c (XLIB_ILLEGAL_ACCESS): No longer needed.
14 15
152013-09-03 Jan Djärv <jan.h.d@swipnet.se> 162013-09-03 Jan Djärv <jan.h.d@swipnet.se>
16 17
diff --git a/src/image.c b/src/image.c
index bcc0fcd78a3..1271376bcab 100644
--- a/src/image.c
+++ b/src/image.c
@@ -30,13 +30,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
30#endif 30#endif
31 31
32#include <setjmp.h> 32#include <setjmp.h>
33
34#include <c-ctype.h> 33#include <c-ctype.h>
35 34
36/* This makes the fields of a Display accessible, in Xlib header files. */
37
38#define XLIB_ILLEGAL_ACCESS
39
40#include "lisp.h" 35#include "lisp.h"
41#include "frame.h" 36#include "frame.h"
42#include "window.h" 37#include "window.h"
diff --git a/src/xfns.c b/src/xfns.c
index 48bf04dea13..b08fc76524c 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -22,10 +22,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
22#include <math.h> 22#include <math.h>
23#include <unistd.h> 23#include <unistd.h>
24 24
25/* This makes the fields of a Display accessible, in Xlib header files. */
26
27#define XLIB_ILLEGAL_ACCESS
28
29#include "lisp.h" 25#include "lisp.h"
30#include "xterm.h" 26#include "xterm.h"
31#include "frame.h" 27#include "frame.h"