X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/a64bfdfa5a90731b804c057f2bcc74a8ba02937c..657e54f709cb435a5ca93f0184e214dd9e586f29:/src/nsgui.h diff --git a/src/nsgui.h b/src/nsgui.h index 5cc2eee323..5935531fa4 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-2011 Free Software Foundation, Inc. + Copyright (C) 1995, 2005, 2008-2014 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -27,7 +27,6 @@ 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 @@ -36,7 +35,6 @@ along with GNU Emacs. If not, see . */ #ifdef NS_IMPL_COCOA #undef Cursor -#define init_process emacs_init_process #endif /* NS_IMPL_COCOA */ #import @@ -65,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 @@ -202,4 +200,3 @@ typedef struct _NSRect { NSPoint origin; NSSize size; } NSRect; #define PWinGravity (1L << 9) /* program specified window gravity */ #endif /* __NSGUI_H__ */ -