# HG changeset patch
# User Dominique Quatravaux <domq@google.com>
# Date 1204559362 -3600
# Branch compile-fixes
# Node ID 07c2e93853c62e799532079839453bca9b8d9ba1
# Parent  dd9030354e14e99e8be265b2093cc588759e13cd
Trivial typo

diff -r dd9030354e14 -r 07c2e93853c6 src/console-gtk.c
--- a/src/console-gtk.c	Thu Feb 28 19:48:36 2008 -0800
+++ b/src/console-gtk.c	Mon Mar 03 16:49:22 2008 +0100
@@ -178,7 +178,7 @@ gtk_perhaps_init_unseen_key_defaults (st
 
   if (NILP (Flookup_key (Vcurrent_global_map, key, Qnil))) 
     {
-      Fputhash(key, Qt, Vgtk_seen_characters;)
+      Fputhash(key, Qt, Vgtk_seen_characters);
       Fdefine_key (Vcurrent_global_map, key, Qself_insert_command); 
       if (SYMBOLP(key))
 	{
# HG changeset patch
# User Dominique Quatravaux <domq@google.com>
# Date 1204560226 -3600
# Branch compile-fixes
# Node ID aa1d99fe48d4a780a257a123c9dd39b4d32a589c
# Parent  07c2e93853c62e799532079839453bca9b8d9ba1
Basically redid Ubuntu Hardy's 20_gcc_4.0.dpatch: gcc 4.0 doesn't
quite like using a cast as an lvalue.

diff -r 07c2e93853c6 -r aa1d99fe48d4 src/glyphs-gtk.c
--- a/src/glyphs-gtk.c	Mon Mar 03 16:49:22 2008 +0100
+++ b/src/glyphs-gtk.c	Mon Mar 03 17:03:46 2008 +0100
@@ -796,7 +796,7 @@ init_image_instance_from_gdk_image (stru
     find_keyword_in_vector (instantiator, Q_file);
 
   IMAGE_INSTANCE_GTK_PIXMAP (ii) = pixmap;
-  IMAGE_INSTANCE_GTK_MASK (ii) = 0;
+  IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0;
   IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = gdk_image->width;
   IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = gdk_image->height;
   IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = gdk_image->depth;
# HG changeset patch
# User Dominique Quatravaux <domq@google.com>
# Date 1204560296 -3600
# Branch compile-fixes
# Node ID 5f6a27b738f1ca31dadb9dc6afcccc1b34970a9c
# Parent  aa1d99fe48d4a780a257a123c9dd39b4d32a589c
Same intent as previous diff; different place

diff -r aa1d99fe48d4 -r 5f6a27b738f1 src/glyphs-gtk.c
--- a/src/glyphs-gtk.c	Mon Mar 03 17:03:46 2008 +0100
+++ b/src/glyphs-gtk.c	Mon Mar 03 17:04:56 2008 +0100
@@ -2972,7 +2972,7 @@ gtk_colorize_image_instance (Lisp_Object
       IMAGE_INSTANCE_TYPE (p) = IMAGE_COLOR_PIXMAP;
       /* Make sure there aren't two pointers to the same mask, causing
 	 it to get freed twice. */
-      IMAGE_INSTANCE_GTK_MASK (p) = 0;
+      IMAGE_INSTANCE_PIXMAP_MASK (p) = 0;
       break;
 
     default:
# HG changeset patch
# User Dominique Quatravaux <domq@google.com>
# Date 1204708879 -3600
# Branch compile-fixes
# Node ID e9a98106f923c1ba62a49e8810224af1ad48b8d3
# Parent  5f6a27b738f1ca31dadb9dc6afcccc1b34970a9c
Change log entry

diff -r 5f6a27b738f1 -r e9a98106f923 ChangeLog
--- a/ChangeLog	Mon Mar 03 17:04:56 2008 +0100
+++ b/ChangeLog	Wed Mar 05 10:21:19 2008 +0100
@@ -1,3 +1,7 @@ 2008-02-15  Marcus Crestani  <crestani@x
+2008-03-05  Dominique Quatravaux  <domq@cpan.org>
+
+	* fixed compilation under gcc 4.x
+
 2008-02-15  Marcus Crestani  <crestani@xemacs.org>
 
 	* configure.ac: Look for all x86 machines to determine which write