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 @@
+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
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;
 #endif /* HAVE_X_WINDOWS */
 
 #ifdef HAVE_NTGUI
+#include "w32.h"
 /* W32_TODO : Color tables on W32.  */
 #undef COLOR_TABLE_SUPPORT