HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2012-12-23T02:41:17Z!rgm@gnu.org
[bpt/emacs.git]
/
src
/
nsgui.h
diff --git
a/src/nsgui.h
b/src/nsgui.h
index
a695563
..
53d0c8b
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.
/* Definitions and headers for communication on the NeXT/Open/GNUstep API.
- Copyright (C) 1995, 2005, 2008-201
1
Free Software Foundation, Inc.
+ Copyright (C) 1995, 2005, 2008-201
3
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-27,14
+27,14
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#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
#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 */
#endif /* NS_IMPL_COCOA */
+#undef verify
+
#import <AppKit/AppKit.h>
#ifdef NS_IMPL_COCOA
#undef Cursor
#import <AppKit/AppKit.h>
#ifdef NS_IMPL_COCOA
#undef Cursor
-#define init_process emacs_init_process
#endif /* NS_IMPL_COCOA */
#import <Foundation/NSDistantObject.h>
#endif /* NS_IMPL_COCOA */
#import <Foundation/NSDistantObject.h>
@@
-44,6
+44,9
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif /* __OBJC__ */
#endif /* __OBJC__ */
+#undef verify
+#undef _GL_VERIFY_H
+#include <verify.h>
/* menu-related */
#define free_widget_value(wv) xfree (wv)
/* menu-related */
#define free_widget_value(wv) xfree (wv)
@@
-60,7
+63,7
@@
typedef struct _XCharStruct
int descent;
} XCharStruct;
int descent;
} XCharStruct;
-/* Fake tructure from Xlib.h to represent two-byte characters. */
+/* Fake
s
tructure from Xlib.h to represent two-byte characters. */
#ifndef __OBJC__
typedef unsigned short unichar;
#endif
#ifndef __OBJC__
typedef unsigned short unichar;
#endif
@@
-129,7
+132,7
@@
typedef struct {
} XRectangle;
#ifndef __OBJC__
} XRectangle;
#ifndef __OBJC__
-#if defined(__LP64__) && __LP64__
+#if defined
(__LP64__) && __LP64__
typedef double CGFloat;
#else
typedef float CGFloat;
typedef double CGFloat;
#else
typedef float CGFloat;
@@
-197,4
+200,3
@@
typedef struct _NSRect { NSPoint origin; NSSize size; } NSRect;
#define PWinGravity (1L << 9) /* program specified window gravity */
#endif /* __NSGUI_H__ */
#define PWinGravity (1L << 9) /* program specified window gravity */
#endif /* __NSGUI_H__ */
-