Fix crashes on MS-Windows due to pop-up menus (Bug#19596)

[gnu-emacs] / src / nsgui.h

diff --git a/src/nsgui.h b/src/nsgui.h
index 0e1e9bb73e9d2d521afa6da3195dcf2f47c37389..498eb7f87f5fcf50a7ee675f3e792da12d785110 100644 (file)
--- a/src/nsgui.h
+++ b/src/nsgui.h
@@ -1,5 +1,5 @@
 /* Definitions and headers for communication on the NeXT/Open/GNUstep API.
-   Copyright (C) 1995, 2005, 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2005, 2008-2015 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -68,10 +68,10 @@ typedef unichar XChar2b;
   (*(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