# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1202388711 0
# Node ID acb32817f0e8c422c9cde5f69e058aa950659231
# Parent  eeab8708c9c325f355ac6f4a41d48abd422adef0
Use "do...while (0)", not "if (1)..else" in macro definitions.

diff -r eeab8708c9c3 -r acb32817f0e8 src/character.h
--- a/src/character.h	Thu Feb 07 12:47:00 2008 +0000
+++ b/src/character.h	Thu Feb 07 12:51:51 2008 +0000
@@ -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