diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-16 14:34:32 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-16 14:34:32 -0700 |
| commit | a6670b0ba2834d8996162596a55e09b1428e4ee6 (patch) | |
| tree | dfdbfd6b8ee3173bc82b7f2d2eb58464bd57edfa /src/character.h | |
| parent | cef2010db4a6e9f7264e60620c0e84123245e696 (diff) | |
| download | emacs-a6670b0ba2834d8996162596a55e09b1428e4ee6.tar.gz | |
* character.h (FETCH_STRING_CHAR_ADVANCE_NO_CHECK, BUF_INC_POS):
Rename locals to avoid shadowing.
Diffstat (limited to 'src/character.h')
| -rw-r--r-- | src/character.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/character.h b/src/character.h index 77c670728d0..4c468e14d2c 100644 --- a/src/character.h +++ b/src/character.h @@ -397,11 +397,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define FETCH_STRING_CHAR_ADVANCE_NO_CHECK(OUTPUT, STRING, CHARIDX, BYTEIDX) \ do \ { \ - unsigned char *ptr = &SDATA (STRING)[BYTEIDX]; \ - int len; \ + unsigned char *fetch_ptr = &SDATA (STRING)[BYTEIDX]; \ + int fetch_len; \ \ - OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len); \ - BYTEIDX += len; \ + OUTPUT = STRING_CHAR_AND_LENGTH (fetch_ptr, fetch_len); \ + BYTEIDX += fetch_len; \ CHARIDX++; \ } \ while (0) @@ -510,8 +510,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define BUF_INC_POS(buf, pos_byte) \ do { \ - unsigned char *p = BUF_BYTE_ADDRESS (buf, pos_byte); \ - pos_byte += BYTES_BY_CHAR_HEAD (*p); \ + unsigned char *bbp = BUF_BYTE_ADDRESS (buf, pos_byte); \ + pos_byte += BYTES_BY_CHAR_HEAD (*bbp); \ } while (0) |