[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109058: Rename init_process rather t
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109058: Rename init_process rather than working around it on Darwin |
Date: |
Thu, 12 Jul 2012 19:56:39 -0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109058
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-07-12 19:56:39 -0400
message:
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.
modified:
admin/notes/multi-tty
src/ChangeLog
src/emacs.c
src/lisp.h
src/nsgui.h
src/process.c
src/s/darwin.h
src/sysselect.h
=== modified file 'admin/notes/multi-tty'
--- a/admin/notes/multi-tty 2012-01-19 07:21:25 +0000
+++ b/admin/notes/multi-tty 2012-07-12 23:56:39 +0000
@@ -906,7 +906,7 @@
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.
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-07-12 21:14:13 +0000
+++ b/src/ChangeLog 2012-07-12 23:56:39 +0000
@@ -1,3 +1,12 @@
+2012-07-12 Glenn Morris <address@hidden>
+
+
+ * 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 <address@hidden>
* xdisp.c (insert_left_trunc_glyphs): Fix incorrect size in
=== modified file 'src/emacs.c'
--- a/src/emacs.c 2012-07-10 01:04:28 +0000
+++ b/src/emacs.c 2012-07-12 23:56:39 +0000
@@ -1597,8 +1597,8 @@
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. */
=== modified file 'src/lisp.h'
--- a/src/lisp.h 2012-07-11 07:37:39 +0000
+++ b/src/lisp.h 2012-07-12 23:56:39 +0000
@@ -3060,7 +3060,7 @@
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);
=== modified file 'src/nsgui.h'
--- a/src/nsgui.h 2012-01-19 07:21:25 +0000
+++ b/src/nsgui.h 2012-07-12 23:56:39 +0000
@@ -27,7 +27,6 @@
#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 @@
#ifdef NS_IMPL_COCOA
#undef Cursor
-#define init_process emacs_init_process
#endif /* NS_IMPL_COCOA */
#import <Foundation/NSDistantObject.h>
=== modified file 'src/process.c'
--- a/src/process.c 2012-07-10 23:24:36 +0000
+++ b/src/process.c 2012-07-12 23:56:39 +0000
@@ -7298,8 +7298,10 @@
}
+/* 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;
=== modified file 'src/s/darwin.h'
--- a/src/s/darwin.h 2012-07-12 07:43:05 +0000
+++ b/src/s/darwin.h 2012-07-12 23:56:39 +0000
@@ -34,10 +34,6 @@
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
=== modified file 'src/sysselect.h'
--- a/src/sysselect.h 2012-06-30 15:55:27 +0000
+++ b/src/sysselect.h 2012-07-12 23:56:39 +0000
@@ -16,15 +16,9 @@
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109058: Rename init_process rather than working around it on Darwin,
Glenn Morris <=