X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/35cf62d95cdcd5323dcea4a5385942c342ff1d9c..3bf234fa520ff90db31fae85f306befdadb24532:/src/nsgui.h diff --git a/src/nsgui.h b/src/nsgui.h index 0c9a8a01e6..0e1e9bb73e 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-2012 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 @@ -50,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 {