X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/dacbc44ca3fc825c9e5ffa799f1a0937c1da0020..c582def527fa905dce9abe87232849746aedc6a3:/src/nsgui.h
diff --git a/src/nsgui.h b/src/nsgui.h
index 53d0c8b7c8..cc2e45e3da 100644
--- 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-2013 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2005, 2008-2016 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -48,11 +48,6 @@ along with GNU Emacs. If not, see . */
#undef _GL_VERIFY_H
#include
-/* menu-related */
-#define free_widget_value(wv) xfree (wv)
-#define malloc_widget_value() ((widget_value *) memset (xmalloc \
- (sizeof (widget_value)), 0, sizeof (widget_value)))
-
/* Emulate XCharStruct. */
typedef struct _XCharStruct
{
@@ -73,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