2 files changed, 8 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0928978ba28..eecad1f9689 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-29  Kenichi Handa  <handa@m17n.org>
+
+        * w32gui.h (STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): Surround
+        chp by parentheses.
+
 2010-10-28  Kenichi Handa  <handa@m17n.org>
 
         Implement various display methods for glyphless characters.
diff --git a/src/w32gui.h b/src/w32gui.h
index 9cad4f21f21..079cd19a1f1 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -59,13 +59,13 @@ typedef HCURSOR Cursor;
 
 /* Dealing with bits of wchar_t as if they were an XChar2b.  */
 #define STORE_XCHAR2B(chp, byte1, byte2) \
-  ((*chp) = ((XChar2b)((((byte1) & 0x00ff) << 8) | ((byte2) & 0x00ff))))
+  ((*(chp)) = ((XChar2b)((((byte1) & 0x00ff) << 8) | ((byte2) & 0x00ff))))
 
 #define XCHAR2B_BYTE1(chp) \
- (((*chp) & 0xff00) >> 8)
+  (((*(chp)) & 0xff00) >> 8)
 
 #define XCHAR2B_BYTE2(chp) \
- ((*chp) & 0x00ff)
+  ((*(chp)) & 0x00ff)
 
 
 /* Windows equivalent of XImage.  */