[Emacs-diffs] /srv/bzr/emacs/trunk r109838: Fix last changes related to w32 and Cygwin.

[Eli Zaretskii]

------------------------------------------------------------
revno: 109838
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-09-01 12:29:17 +0300
message:
  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.
modified:
  src/ChangeLog
  src/image.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-01 08:22:10 +0000
+++ b/src/ChangeLog     2012-09-01 09:29:17 +0000
@@ -1,3 +1,9 @@
+2012-09-01  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * w32fns.c (x_display_info_for_name): Prevent crash if w32 window

=== modified file 'src/image.c'
--- a/src/image.c       2012-09-01 06:38:52 +0000
+++ b/src/image.c       2012-09-01 09:29:17 +0000
@@ -76,6 +76,7 @@
 #endif /* HAVE_X_WINDOWS */
 
 #ifdef HAVE_NTGUI
+#include "w32.h"
 /* W32_TODO : Color tables on W32.  */
 #undef COLOR_TABLE_SUPPORT