XCHAR2B_BYTE[12] definitions in NS

[Daiki Ueno <ueno@gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 353 bytes --]

Hi,

While I'm doing some experiment based on the NS port, I sometimes get
unexpected glyph index, because of missing parentheses in
XCHAR2B_BYTE[12] definitions (patch attached).  I believe those macros
are not actually used by the NS port, but maybe good to fix it to avoid
any confusion.  OK to commit, or perhaps they should be completely
removed?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: nsgui.h.patch --]
[-- Type: text/x-patch, Size: 862 bytes --]

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2014-07-14 19:23:18 +0000
+++ src/ChangeLog	2014-07-15 08:48:30 +0000
@@ -1,3 +1,9 @@
+2014-07-15  Daiki Ueno  <ueno@gnu.org>
+
+	* nsgui.h (XCHAR2B_BYTE1): Add missing parentheses around
+	pointer argument, before dereferencing.
+	(XCHAR2B_BYTE2): Likewise.
+
 2014-07-14  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Use binary-io module, O_BINARY, and "b" flag (Bug#18006).

=== modified file 'src/nsgui.h'
--- src/nsgui.h	2014-06-02 18:01:21 +0000
+++ src/nsgui.h	2014-07-15 06:40:08 +0000
@@ -68,10 +68,10 @@
   (*(chp) = ((XChar2b)((((b1) & 0x00ff) << 8) | ((b2) & 0x00ff))))
 
 #define XCHAR2B_BYTE1(chp) \
- (((*chp) & 0xff00) >> 8)
+  ((*(chp) & 0xff00) >> 8)
 
 #define XCHAR2B_BYTE2(chp) \
- ((*chp) & 0x00ff)
+  (*(chp) & 0x00ff)
 
 
 /* XXX: xfaces requires these structures, but the question is are we


[-- Attachment #3: Type: text/plain, Size: 24 bytes --]


Regards,
--
Daiki Ueno