mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-10 21:50:37 -08:00
Code Issues Projects Releases Wiki Activity

Fix last changes related to w32 and Cygwin.

Browse source 
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.
This commit is contained in:
Eli Zaretskii 2012-09-01 12:29:17 +03:00
parent 86571ae075
commit 4dfbd23866
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2012-09-01 Eli Zaretskii <eliz@gnu.org>
* 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.
2012-09-01 Daniel Colascione <dancol@dancol.org>
* w32fns.c (x_display_info_for_name): Prevent crash if w32 window

1
src/image.c
View file

@ -76,6 +76,7 @@ typedef struct x_bitmap_record Bitmap_Record;
#endif /* HAVE_X_WINDOWS */
#ifdef HAVE_NTGUI
#include "w32.h"
/* W32_TODO : Color tables on W32. */
#undef COLOR_TABLE_SUPPORT