aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2008-02-07 12:55:55 +0000
committerJan Djärv2008-02-07 12:55:55 +0000
commitf937a7db33f4d330b2827981cb07c482ceb50fc8 (patch)
tree5bbbf5940318e71c20e065de5c651efdfa2aa756 /src
parenta1c2ac9a200a3c40a373a6cef97c0c96fdfb2c09 (diff)
downloademacs-f937a7db33f4d330b2827981cb07c482ceb50fc8.tar.gz
emacs-f937a7db33f4d330b2827981cb07c482ceb50fc8.zip
(DECODE_EMACS_MULE_COMPOSITION_CHAR): Use "do...while (0)".
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/coding.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8afc3ae7426..6a8c03e80da 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12008-02-07 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * coding.c (DECODE_EMACS_MULE_COMPOSITION_CHAR): Use "do...while (0)".
4
12008-02-07 Jim Meyering <meyering@redhat.com> 52008-02-07 Jim Meyering <meyering@redhat.com>
2 6
3 Use "do...while (0)", not "if (1)..else" in macro definitions. 7 Use "do...while (0)", not "if (1)..else" in macro definitions.
diff --git a/src/coding.c b/src/coding.c
index 7e9a497f1e5..93726169585 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -1898,7 +1898,7 @@ detect_coding_emacs_mule (coding, detect_info)
1898 value 0. */ 1898 value 0. */
1899 1899
1900#define DECODE_EMACS_MULE_COMPOSITION_CHAR(buf) \ 1900#define DECODE_EMACS_MULE_COMPOSITION_CHAR(buf) \
1901 if (1) \ 1901 do \
1902 { \ 1902 { \
1903 int c; \ 1903 int c; \
1904 int nbytes, nchars; \ 1904 int nbytes, nchars; \
@@ -1916,7 +1916,7 @@ detect_coding_emacs_mule (coding, detect_info)
1916 src += nbytes; \ 1916 src += nbytes; \
1917 consumed_chars += nchars; \ 1917 consumed_chars += nchars; \
1918 } \ 1918 } \
1919 else 1919 while (0)
1920 1920
1921 1921
1922/* Decode a composition rule represented as a component of composition 1922/* Decode a composition rule represented as a component of composition