X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/49f70d46ea38ceb7a501594db7f6ea35e19681aa..b7e0ef72d0ac61b5d3ef06a3f565695c75ec2540:/src/nsgui.h
diff --git a/src/nsgui.h b/src/nsgui.h
index cedadab908..53d0c8b7c8 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, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2005, 2008-2013 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -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,6 +44,9 @@ along with GNU Emacs. If not, see . */
#endif /* __OBJC__ */
+#undef verify
+#undef _GL_VERIFY_H
+#include
/* menu-related */
#define free_widget_value(wv) xfree (wv)
@@ -60,7 +63,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
@@ -129,7 +132,7 @@ typedef struct {
} XRectangle;
#ifndef __OBJC__
-#if defined(__LP64__) && __LP64__
+#if defined (__LP64__) && __LP64__
typedef double CGFloat;
#else
typedef float CGFloat;
@@ -197,6 +200,3 @@ typedef struct _NSRect { NSPoint origin; NSSize size; } NSRect;
#define PWinGravity (1L << 9) /* program specified window gravity */
#endif /* __NSGUI_H__ */
-
-/* arch-tag: b2af3275-62c3-45b4-9335-4c9635c67e55
- (do not change this comment) */