aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2012-09-01 12:29:17 +0300
committerEli Zaretskii2012-09-01 12:29:17 +0300
commit4dfbd23866adef6886771b80a464decc9e95e7c5 (patch)
treef006663ce0fd599115dfe678c8ddfecc715b27e7
parent86571ae075b3fedc4b7312738fe99af9b7991f69 (diff)
downloademacs-4dfbd23866adef6886771b80a464decc9e95e7c5.tar.gz
emacs-4dfbd23866adef6886771b80a464decc9e95e7c5.zip
Fix last changes related to w32 and Cygwin.
src/image.c: Restore mistakenly removed inclusion of w32.h. Without it, GCC doesn't see prototypes of w32_delayed_load, and complains about implicit conversions from integer to pointer.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/image.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cfa60cbcf66..56e45503ad0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12012-09-01 Eli Zaretskii <eliz@gnu.org>
2
3 * image.c: Restore mistakenly removed inclusion of w32.h. Without
4 it, GCC doesn't see prototypes of w32_delayed_load, and complains
5 about implicit conversions from integer to pointer.
6
12012-09-01 Daniel Colascione <dancol@dancol.org> 72012-09-01 Daniel Colascione <dancol@dancol.org>
2 8
3 * w32fns.c (x_display_info_for_name): Prevent crash if w32 window 9 * w32fns.c (x_display_info_for_name): Prevent crash if w32 window
diff --git a/src/image.c b/src/image.c
index c444c986a76..d4e78d41000 100644
--- a/src/image.c
+++ b/src/image.c
@@ -76,6 +76,7 @@ typedef struct x_bitmap_record Bitmap_Record;
76#endif /* HAVE_X_WINDOWS */ 76#endif /* HAVE_X_WINDOWS */
77 77
78#ifdef HAVE_NTGUI 78#ifdef HAVE_NTGUI
79#include "w32.h"
79/* W32_TODO : Color tables on W32. */ 80/* W32_TODO : Color tables on W32. */
80#undef COLOR_TABLE_SUPPORT 81#undef COLOR_TABLE_SUPPORT
81 82