2 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4d5a0db9a97..567bf2868e7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * image.c (tiff_load): Cast 3rd argument to avoid compiler warning.
+
 2010-10-15  Tassilo Horn  <tassilo@member.fsf.org>
 
         * Makefile.in (really-oldXMenu): Fix typo in variable name that
diff --git a/src/image.c b/src/image.c
index bd742138195..b7edf05fea8 100644
--- a/src/image.c
+++ b/src/image.c
@@ -6793,8 +6793,9 @@ tiff_load (struct frame *f, struct image *img)
       memsrc.len = SBYTES (specified_data);
       memsrc.index = 0;
 
-      /* Casting return value avoids a GCC warning on W32.  */
-      tiff = (TIFF *)fn_TIFFClientOpen ("memory_source", "r", &memsrc,
+      /* Casting arguments return value avoids a GCC warning on W32.  */
+      tiff = (TIFF *)fn_TIFFClientOpen ("memory_source", "r",
+                                        (thandle_t) &memsrc,
                                         (TIFFReadWriteProc) tiff_read_from_memory,
                                         (TIFFReadWriteProc) tiff_write_from_memory,
                                         tiff_seek_in_memory,