diff options
| author | Paul Eggert | 2011-03-10 23:54:50 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-03-10 23:54:50 -0800 |
| commit | e22cffbc1c9ff76a9870311fb6b9fcd49d013933 (patch) | |
| tree | 641e519b06fe4ad2b77663153c8b4952b2d1f3a1 /src/image.c | |
| parent | d5d5a6173b3bd4c68354b6dceab58ac8e25a0deb (diff) | |
| download | emacs-e22cffbc1c9ff76a9870311fb6b9fcd49d013933.tar.gz emacs-e22cffbc1c9ff76a9870311fb6b9fcd49d013933.zip | |
* image.c (xpm_load): Redo to avoid "discards qualifiers" gcc warning.
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/image.c b/src/image.c index e25cef52957..4befadd44ef 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -3425,11 +3425,12 @@ xpm_load (struct frame *f, struct image *img) | |||
| 3425 | { | 3425 | { |
| 3426 | Lisp_Object name; | 3426 | Lisp_Object name; |
| 3427 | Lisp_Object color; | 3427 | Lisp_Object color; |
| 3428 | char *empty_string = (char *) ""; | ||
| 3428 | 3429 | ||
| 3429 | if (!CONSP (XCAR (tail))) | 3430 | if (!CONSP (XCAR (tail))) |
| 3430 | { | 3431 | { |
| 3431 | xpm_syms[i].name = ""; | 3432 | xpm_syms[i].name = empty_string; |
| 3432 | xpm_syms[i].value = ""; | 3433 | xpm_syms[i].value = empty_string; |
| 3433 | continue; | 3434 | continue; |
| 3434 | } | 3435 | } |
| 3435 | name = XCAR (XCAR (tail)); | 3436 | name = XCAR (XCAR (tail)); |
| @@ -3440,14 +3441,14 @@ xpm_load (struct frame *f, struct image *img) | |||
| 3440 | strcpy (xpm_syms[i].name, SSDATA (name)); | 3441 | strcpy (xpm_syms[i].name, SSDATA (name)); |
| 3441 | } | 3442 | } |
| 3442 | else | 3443 | else |
| 3443 | xpm_syms[i].name = ""; | 3444 | xpm_syms[i].name = empty_string; |
| 3444 | if (STRINGP (color)) | 3445 | if (STRINGP (color)) |
| 3445 | { | 3446 | { |
| 3446 | xpm_syms[i].value = (char *) alloca (SCHARS (color) + 1); | 3447 | xpm_syms[i].value = (char *) alloca (SCHARS (color) + 1); |
| 3447 | strcpy (xpm_syms[i].value, SSDATA (color)); | 3448 | strcpy (xpm_syms[i].value, SSDATA (color)); |
| 3448 | } | 3449 | } |
| 3449 | else | 3450 | else |
| 3450 | xpm_syms[i].value = ""; | 3451 | xpm_syms[i].value = empty_string; |
| 3451 | } | 3452 | } |
| 3452 | } | 3453 | } |
| 3453 | 3454 | ||