* image.c (xpm_load): Redo to avoid "discards qualifiers" gcc warning.

diff --git a/src/ChangeLog b/src/ChangeLog
index d1e2fea4edb88f406d947eefcd24f0636cc170ea..158c5ff53302f127f412d8769f5b7db2e8337d12 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
        * image.c (clear_image_cache): Now static.
        (DIM, HAVE_STDLIB_H_1): Remove unused macros.
+       (xpm_load): Redo to avoid "discards qualifiers" gcc warning.
 
 2011-03-11  Paul Eggert  <eggert@cs.ucla.edu>
 

diff --git a/src/image.c b/src/image.c
index e25cef52957ee6702edf293a097d9b3631b743b8..4befadd44ef1e9abb8651e008f09e0c33bff6341 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -3425,11 +3425,12 @@ xpm_load (struct frame *f, struct image *img)
        {
          Lisp_Object name;
          Lisp_Object color;
+         char *empty_string = (char *) "";
 
          if (!CONSP (XCAR (tail)))
            {
-             xpm_syms[i].name = "";
-             xpm_syms[i].value = "";
+             xpm_syms[i].name = empty_string;
+             xpm_syms[i].value = empty_string;
              continue;
            }
          name = XCAR (XCAR (tail));
@@ -3440,14 +3441,14 @@ xpm_load (struct frame *f, struct image *img)
              strcpy (xpm_syms[i].name, SSDATA (name));
            }
          else
-           xpm_syms[i].name = "";
+           xpm_syms[i].name = empty_string;
          if (STRINGP (color))
            {
              xpm_syms[i].value = (char *) alloca (SCHARS (color) + 1);
              strcpy (xpm_syms[i].value, SSDATA (color));
            }
          else
-           xpm_syms[i].value = "";
+           xpm_syms[i].value = empty_string;
        }
     }