Mercurial > hg > xemacs-beta

diff src/glyphs-gtk.c @ 2272:4ec724310f33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2004-09-14 20:54:29 by james] Eliminate gcc shadow warnings.
author james
date Tue, 14 Sep 2004 20:54:37 +0000
parents 95fee4a1420e
children 04bc9d2f42c7
line wrap: on
line diff
--- a/src/glyphs-gtk.c	Tue Sep 14 20:26:46 2004 +0000
+++ b/src/glyphs-gtk.c	Tue Sep 14 20:54:37 2004 +0000
@@ -1429,7 +1429,8 @@
 
 extern guint symbol_to_enum (Lisp_Object, GtkType);
 
-static guint resource_name_to_resource (Lisp_Object name, image_instance_type type)
+static guint resource_name_to_resource (Lisp_Object name,
+					enum image_instance_type type)
 {
   if (type == IMAGE_POINTER)
     return (symbol_to_enum (name, GTK_TYPE_GDK_CURSOR_TYPE));
@@ -1437,7 +1438,7 @@
     return (0);
 }
 
-static image_instance_type
+static enum image_instance_type
 resource_symbol_to_type (Lisp_Object data)
 {
   if (EQ (data, Qcursor))
@@ -1459,7 +1460,7 @@
 {
   struct Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
   GdkCursor *c = NULL;
-  image_instance_type type;
+  enum image_instance_type type;
   Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
   Lisp_Object resource_type = find_keyword_in_vector (instantiator, Q_resource_type);
   Lisp_Object resource_id = find_keyword_in_vector (instantiator, Q_resource_id);