diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-07 16:22:52 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-07 16:22:52 -0800 |
| commit | f60958682b055102431c24a30b598a2bf3ec97c3 (patch) | |
| tree | 6f64d14c70c3e706d5f40bc8522aef47044b67b0 /src/charset.h | |
| parent | d6550a9f3013b49b2d04395ed19f0ea1ec683e6c (diff) | |
| download | emacs-f60958682b055102431c24a30b598a2bf3ec97c3.tar.gz | |
* charset.h (CHECK_CHARSET_GET_CHARSET): Rename locals to avoid
shadowing.
* charset.c (map_charset_for_dump, Fchar_charset): Likewise.
Diffstat (limited to 'src/charset.h')
| -rw-r--r-- | src/charset.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/charset.h b/src/charset.h index 1fc552a5bd3..8c87ffe6c3d 100644 --- a/src/charset.h +++ b/src/charset.h @@ -358,9 +358,9 @@ extern int emacs_mule_charset[256]; #define CHECK_CHARSET_GET_CHARSET(x, charset) \ do { \ - int id; \ - CHECK_CHARSET_GET_ID (x, id); \ - charset = CHARSET_FROM_ID (id); \ + int csid; \ + CHECK_CHARSET_GET_ID (x, csid); \ + charset = CHARSET_FROM_ID (csid); \ } while (0) @@ -541,4 +541,3 @@ extern void map_charset_chars (void (*) (Lisp_Object, Lisp_Object), struct charset *, unsigned, unsigned); #endif /* EMACS_CHARSET_H */ - |