X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/11fdef7d0cf3ef1ce30d1cd09ca9ca9a2b099d20..3698c4e475fb59730626af5d001599785ef5ef9e:/src/nsgui.h
diff --git a/src/nsgui.h b/src/nsgui.h
index a695563094..8dac1bde9b 100644
--- a/src/nsgui.h
+++ b/src/nsgui.h
@@ -1,12 +1,12 @@
/* Definitions and headers for communication on the NeXT/Open/GNUstep API.
- Copyright (C) 1995, 2005, 2008-2011 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2005, 2008-2016 Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27,14 +27,14 @@ along with GNU Emacs. If not, see . */
#warning "Z is defined. If you get a later parse error in a header, check that buffer.h or other files #define-ing Z are not included."
#endif /* Z */
#define Cursor FooFoo
-#undef init_process
#endif /* NS_IMPL_COCOA */
+#undef verify
+
#import
#ifdef NS_IMPL_COCOA
#undef Cursor
-#define init_process emacs_init_process
#endif /* NS_IMPL_COCOA */
#import
@@ -44,11 +44,9 @@ along with GNU Emacs. If not, see . */
#endif /* __OBJC__ */
-
-/* menu-related */
-#define free_widget_value(wv) xfree (wv)
-#define malloc_widget_value() ((widget_value *) memset (xmalloc \
- (sizeof (widget_value)), 0, sizeof (widget_value)))
+#undef verify
+#undef _GL_VERIFY_H
+#include
/* Emulate XCharStruct. */
typedef struct _XCharStruct
@@ -60,7 +58,7 @@ typedef struct _XCharStruct
int descent;
} XCharStruct;
-/* Fake tructure from Xlib.h to represent two-byte characters. */
+/* Fake structure from Xlib.h to represent two-byte characters. */
#ifndef __OBJC__
typedef unsigned short unichar;
#endif
@@ -70,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
@@ -129,7 +127,7 @@ typedef struct {
} XRectangle;
#ifndef __OBJC__
-#if defined(__LP64__) && __LP64__
+#if defined (__LP64__) && __LP64__
typedef double CGFloat;
#else
typedef float CGFloat;
@@ -197,4 +195,3 @@ typedef struct _NSRect { NSPoint origin; NSSize size; } NSRect;
#define PWinGravity (1L << 9) /* program specified window gravity */
#endif /* __NSGUI_H__ */
-