aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Popineau2012-09-30 23:52:49 +0200
committerEli Zaretskii2012-09-30 23:52:49 +0200
commit5e4daaf3face7ed54de7cb3621edb31e16b011ed (patch)
treea772a79275815b73865dec5bd162c6930d109d45
parent62aba0d4973c5cba7ac7c387bbe133e0e3061c5c (diff)
downloademacs-5e4daaf3face7ed54de7cb3621edb31e16b011ed.tar.gz
emacs-5e4daaf3face7ed54de7cb3621edb31e16b011ed.zip
Fix last commit.
-rw-r--r--src/ChangeLog1
-rw-r--r--src/w32term.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index be6ebd33ea6..96f6eb07cd1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,7 @@
4 * w32term.h (SCROLL_BAR_PACK, SCROLL_BAR_UNPACK): Define for x64. 4 * w32term.h (SCROLL_BAR_PACK, SCROLL_BAR_UNPACK): Define for x64.
5 (SET_SCROLL_BAR_W32_WINDOW): Cast ID to intptr_t, for 5 (SET_SCROLL_BAR_W32_WINDOW): Cast ID to intptr_t, for
6 compatibility with x64. 6 compatibility with x64.
7 (x_get_focus_frame): Add prototype.
7 8
8 * w32term.c (w32_draw_underwave): Don't use GCC extensions for 9 * w32term.c (w32_draw_underwave): Don't use GCC extensions for
9 defining an XRectangle structure. 10 defining an XRectangle structure.
diff --git a/src/w32term.h b/src/w32term.h
index 5cfef5d1dea..fcaccc4d624 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -201,6 +201,8 @@ extern struct w32_display_info *w32_term_init (Lisp_Object,
201extern int x_display_pixel_height (struct w32_display_info *); 201extern int x_display_pixel_height (struct w32_display_info *);
202extern int x_display_pixel_width (struct w32_display_info *); 202extern int x_display_pixel_width (struct w32_display_info *);
203 203
204extern Lisp_Object x_get_focus_frame (struct frame *);
205
204 206
205#define PIX_TYPE COLORREF 207#define PIX_TYPE COLORREF
206 208