[Emacs-diffs] Changes to emacs/src/character.h,v

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd>        08/02/07 12:51:51

Index: character.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/character.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- character.h 2 Feb 2008 04:32:01 -0000       1.3
+++ character.h 7 Feb 2008 12:51:51 -0000       1.4
@@ -380,7 +380,7 @@
    we increment them past the character fetched.  */
 
 #define FETCH_STRING_CHAR_ADVANCE(OUTPUT, STRING, CHARIDX, BYTEIDX)    \
-  if (1)                                                               \
+  do                                                                    \
     {                                                                  \
       CHARIDX++;                                                       \
       if (STRING_MULTIBYTE (STRING))                                   \
@@ -394,13 +394,13 @@
       else                                                             \
        OUTPUT = XSTRING (STRING)->data[BYTEIDX++];                     \
     }                                                                  \
-  else
+  while (0)
 
 /* Like FETCH_STRING_CHAR_ADVANCE but return a multibyte character eve
    if STRING is unibyte.  */
 
 #define FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE(OUTPUT, STRING, CHARIDX, 
BYTEIDX) \
-  if (1)                                                                     \
+  do                                                                          \
     {                                                                        \
       CHARIDX++;                                                             \
       if (STRING_MULTIBYTE (STRING))                                         \
@@ -417,13 +417,13 @@
          MAKE_CHAR_MULTIBYTE (OUTPUT);                                       \
        }                                                                     \
     }                                                                        \
-  else
+  while (0)
 
 
 /* Like FETCH_STRING_CHAR_ADVANCE but assumes STRING is multibyte.  */
 
 #define FETCH_STRING_CHAR_ADVANCE_NO_CHECK(OUTPUT, STRING, CHARIDX, BYTEIDX) \
-  if (1)                                                                    \
+  do                                                                        \
     {                                                                       \
       unsigned char *ptr = &XSTRING (STRING)->data[BYTEIDX];                \
       int len;                                                              \
@@ -432,14 +432,14 @@
       BYTEIDX += len;                                                       \
       CHARIDX++;                                                            \
     }                                                                       \
-  else
+  while (0)
 
 
 /* Like FETCH_STRING_CHAR_ADVANCE but fetch character from the current
    buffer.  */
 
 #define FETCH_CHAR_ADVANCE(OUTPUT, CHARIDX, BYTEIDX)           \
-  if (1)                                                       \
+  do                                                           \
     {                                                          \
       CHARIDX++;                                               \
       if (!NILP (current_buffer->enable_multibyte_characters)) \
@@ -456,13 +456,13 @@
          BYTEIDX++;                                            \
        }                                                       \
     }                                                          \
-  else
+  while (0)
 
 
 /* Like FETCH_CHAR_ADVANCE but assumes the current buffer is multibyte.  */
 
 #define FETCH_CHAR_ADVANCE_NO_CHECK(OUTPUT, CHARIDX, BYTEIDX)  \
-  if (1)                                                       \
+  do                                                           \
     {                                                          \
       unsigned char *ptr = BYTE_POS_ADDR (BYTEIDX);            \
       int len;                                                 \
@@ -471,7 +471,7 @@
       BYTEIDX += len;                                          \
       CHARIDX++;                                               \
     }                                                          \
-  else
+  while (0)
 
 
 /* Increase the buffer byte position POS_BYTE of the current buffer to