From b82da769e5bd9aab6ee2102d4c98ed7e1c6541bb Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 12 Jul 2012 19:56:39 -0400 Subject: [PATCH] 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. --- admin/notes/multi-tty | 2 +- src/ChangeLog | 9 +++++++++ src/emacs.c | 4 ++-- src/lisp.h | 2 +- src/nsgui.h | 2 -- src/process.c | 4 +++- src/s/darwin.h | 4 ---- src/sysselect.h | 6 ------ 8 files changed, 16 insertions(+), 17 deletions(-) diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index 4146c8ffa58..5408b9a3d00 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty @@ -906,7 +906,7 @@ DIARY OF CHANGES read_avail_input. (Fixed. This was caused by unconditionally including stdin in - input_wait_mask in init_process. The select call in + input_wait_mask in init_process_emacs. The select call in wait_reading_process_input always returned immediately, indicating that there is pending input from stdin, which nobody read. diff --git a/src/ChangeLog b/src/ChangeLog index 49014c340dc..8383cf17b03 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2012-07-12 Glenn Morris + + + * process.c (init_process_emacs): Rename from init_process. + The old name is also the name of a Mach system call. + * lisp.h, emacs.c: Update for this name change. + * nsgui.h, sysselect.h, s/darwin.h: Remove workaround that is no + longer needed. + 2012-07-12 Eli Zaretskii * xdisp.c (insert_left_trunc_glyphs): Fix incorrect size in diff --git a/src/emacs.c b/src/emacs.c index 2194cfead16..db01b13c32d 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1597,8 +1597,8 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem init_charset (); - init_editfns (); /* init_process uses Voperating_system_release. */ - init_process (); /* init_display uses add_keyboard_wait_descriptor. */ + init_editfns (); /* init_process_emacs uses Voperating_system_release. */ + init_process_emacs (); /* init_display uses add_keyboard_wait_descriptor. */ init_keyboard (); /* This too must precede init_sys_modes. */ if (!noninteractive) init_display (); /* Determine terminal type. Calls init_sys_modes. */ diff --git a/src/lisp.h b/src/lisp.h index e01f21e84d8..529feb99fd5 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3060,7 +3060,7 @@ extern void add_gpm_wait_descriptor (int); extern void delete_gpm_wait_descriptor (int); #endif extern void close_process_descs (void); -extern void init_process (void); +extern void init_process_emacs (void); extern void syms_of_process (void); extern void setup_process_coding_systems (Lisp_Object); 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 . */ #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 diff --git a/src/process.c b/src/process.c index 98a47eca7ae..44f8520745d 100644 --- a/src/process.c +++ b/src/process.c @@ -7298,8 +7298,10 @@ integer or floating point values. } +/* This is not called "init_process" because that is the name of a + Mach system call, so it would cause problems on Darwin systems. */ void -init_process (void) +init_process_emacs (void) { #ifdef subprocesses register int i; diff --git a/src/s/darwin.h b/src/s/darwin.h index c853f9d94f0..48f6f583d1e 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -34,10 +34,6 @@ along with GNU Emacs. If not, see . */ for process-connection-type dependent on the kernel version. */ #define MIN_PTY_KERNEL_VERSION '7' -/* Avoid the use of the name init_process (process.c) because it is - also the name of a Mach system call. */ -#define init_process emacs_init_process - /* Definitions for how to compile & link. */ #ifdef HAVE_NS #define SYSTEM_PURESIZE_EXTRA 200000 diff --git a/src/sysselect.h b/src/sysselect.h index 2dbbede2bff..24bdf469ced 100644 --- a/src/sysselect.h +++ b/src/sysselect.h @@ -16,15 +16,9 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -#if defined (DARWIN_OS) -#undef init_process -#endif #ifndef DOS_NT #include #endif -#if defined (DARWIN_OS) -#define init_process emacs_init_process -#endif /* The w32 build defines select stuff in w32.h, which is included where w32 needs it, but not where sysselect.h is included. The w32 -- 2.39.2