Commit b82da769 authored by Glenn Morris's avatar Glenn Morris

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.
parent ba9e4b84
......@@ -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.
......
2012-07-12 Glenn Morris <rgm@gnu.org>
* 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 <eliz@gnu.org>
* xdisp.c (insert_left_trunc_glyphs): Fix incorrect size in
......
......@@ -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. */
......
......@@ -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);
......
......@@ -27,7 +27,6 @@ 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
#undef init_process
#endif /* NS_IMPL_COCOA */
#undef verify
......@@ -36,7 +35,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifdef NS_IMPL_COCOA
#undef Cursor
#define init_process emacs_init_process
#endif /* NS_IMPL_COCOA */
#import <Foundation/NSDistantObject.h>
......
......@@ -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;
......
......@@ -34,10 +34,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
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
......
......@@ -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 <http://www.gnu.org/licenses/>. */
#if defined (DARWIN_OS)
#undef init_process
#endif
#ifndef DOS_NT
#include <sys/select.h>
#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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment