diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-15 11:02:42 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-15 11:02:42 -0700 |
| commit | 7e47afad4513977ba3cc5a175081f1c258a8ddfe (patch) | |
| tree | ca829e1e27ee00e50518f5b34c70dd2e3e9a0056 /src/character.h | |
| parent | 5671df8f51e552ca7d61296faf67b110b6a33235 (diff) | |
| download | emacs-7e47afad4513977ba3cc5a175081f1c258a8ddfe.tar.gz | |
* character.h (INC_POS, DEC_POS): Rename locals to avoid shadowing.
Diffstat (limited to 'src/character.h')
| -rw-r--r-- | src/character.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/character.h b/src/character.h index 6d5b8110109..bbf5550c711 100644 --- a/src/character.h +++ b/src/character.h @@ -451,8 +451,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define INC_POS(pos_byte) \ do { \ - unsigned char *p = BYTE_POS_ADDR (pos_byte); \ - pos_byte += BYTES_BY_CHAR_HEAD (*p); \ + unsigned char *ptr = BYTE_POS_ADDR (pos_byte); \ + pos_byte += BYTES_BY_CHAR_HEAD (*ptr); \ } while (0) @@ -461,16 +461,16 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define DEC_POS(pos_byte) \ do { \ - unsigned char *p; \ + unsigned char *ptr; \ \ pos_byte--; \ if (pos_byte < GPT_BYTE) \ - p = BEG_ADDR + pos_byte - BEG_BYTE; \ + ptr = BEG_ADDR + pos_byte - BEG_BYTE; \ else \ - p = BEG_ADDR + GAP_SIZE + pos_byte - BEG_BYTE;\ - while (!CHAR_HEAD_P (*p)) \ + ptr = BEG_ADDR + GAP_SIZE + pos_byte - BEG_BYTE; \ + while (!CHAR_HEAD_P (*ptr)) \ { \ - p--; \ + ptr--; \ pos_byte--; \ } \ } while (0) |