aboutsummaryrefslogtreecommitdiffstats
path: root/src/nsgui.h
diff options
context:
space:
mode:
authorGlenn Morris2012-07-12 19:56:39 -0400
committerGlenn Morris2012-07-12 19:56:39 -0400
commitb82da769e5bd9aab6ee2102d4c98ed7e1c6541bb (patch)
treeb2ceffaf072612d2e1121a680c8f381148761646 /src/nsgui.h
parentba9e4b84ac8322e84cd0cc1c5fe6d5d8a8453ff5 (diff)
downloademacs-b82da769e5bd9aab6ee2102d4c98ed7e1c6541bb.tar.gz
emacs-b82da769e5bd9aab6ee2102d4c98ed7e1c6541bb.zip
Rename init_process rather than working around it on Darwin
The old name is also the name of a Mach system call. * src/process.c (init_process_emacs): Rename from init_process. * src/lisp.h, src/emacs.c: Update for this name change. * src/nsgui.h, src/sysselect.h, src/s/darwin.h: Remove workaround that is no longer needed.
Diffstat (limited to 'src/nsgui.h')
-rw-r--r--src/nsgui.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/nsgui.h b/src/nsgui.h
index 0c9a8a01e69..60c38b221fb 100644
--- a/src/nsgui.h
+++ b/src/nsgui.h
@@ -27,7 +27,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
27#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." 27#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."
28#endif /* Z */ 28#endif /* Z */
29#define Cursor FooFoo 29#define Cursor FooFoo
30#undef init_process
31#endif /* NS_IMPL_COCOA */ 30#endif /* NS_IMPL_COCOA */
32 31
33#undef verify 32#undef verify
@@ -36,7 +35,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
36 35
37#ifdef NS_IMPL_COCOA 36#ifdef NS_IMPL_COCOA
38#undef Cursor 37#undef Cursor
39#define init_process emacs_init_process
40#endif /* NS_IMPL_COCOA */ 38#endif /* NS_IMPL_COCOA */
41#import <Foundation/NSDistantObject.h> 39#import <Foundation/NSDistantObject.h>
42 40