Commit fc549af9 authored by Eli Zaretskii's avatar Eli Zaretskii

Fix the MS-DOS build (fallout from 2010-07-12T14:16:38Z!schwab@linux-m68k.org,...

Fix the MS-DOS build (fallout from 2010-07-12T14:16:38Z!schwab@linux-m68k.org, 2010-07-12T17:04:38Z!dann@ics.uci.edu, 2010-07-12T17:21:11Z!dann@ics.uci.edu).

 msdos/sed1v2.inp (C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS):
 Edit to empty.
 msdos/sed3v2.inp(C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS):
 Edit to empty.
 src/process.c (setup_process_coding_systems): Move to the part
 shared by non-subprocesses systems, and make its body empty when
 subprocesses is not defined.
 (close_process_descs): Move to the part shared by non-subprocesses
 systems.
parent ded80a25
2010-07-12 Eli Zaretskii <eliz@gnu.org>
* sed1v2.inp (C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS):
Edit to empty.
* sed3v2.inp(C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS):
Edit to empty.
2010-07-11 Eli Zaretskii <eliz@gnu.org>
* sed2v2.inp (HAVE_STRCHR, HAVE_STRRCHR): Don't edit, already
......
......@@ -40,6 +40,9 @@ s/\.h\.in/.h-in/
/^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@//
/^C_SWITCH_X_SYSTEM *=/s/@C_SWITCH_X_SYSTEM@//
/^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@//
/^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@//
/^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@//
/^PROFILING_LDFLAGS *=/s/@PROFILING_LDFLAGS@//
#/^LD_SWITCH_X_SITE *=/s/@LD_SWITCH_X_SITE@//
/^LD_SWITCH_SYSTEM_TEMACS *=/s/@LD_SWITCH_SYSTEM_TEMACS@//
/^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@//
......
......@@ -39,6 +39,9 @@
/^CFLAGS *=/s!=.*$!=-O2 -g!
/^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS!
/^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
/^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@//
/^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@//
/^PROFILING_LDFLAGS *=/s/@PROFILING_LDFLAGS@//
/^LOADLIBES *=/s!=.*$!=!
/^ALLOCA *=/s!@ALLOCA@!!
/^EXEEXT *=/s!@EXEEXT@!!
......
2010-07-12 Eli Zaretskii <eliz@gnu.org>
* process.c (setup_process_coding_systems): Move to the part
shared by non-subprocesses systems, and make its body empty when
subprocesses is not defined.
(close_process_descs): Move to the part shared by non-subprocesses
systems.
2010-07-12 Dan Nicolaescu <dann@ics.uci.edu>
* callproc.c (child_setup): Remove subprocesses conditional.
......
......@@ -642,38 +642,6 @@ remove_process (register Lisp_Object proc)
deactivate_process (proc);
}
/* Setup coding systems of PROCESS. */
void
setup_process_coding_systems (Lisp_Object process)
{
struct Lisp_Process *p = XPROCESS (process);
int inch = p->infd;
int outch = p->outfd;
Lisp_Object coding_system;
if (inch < 0 || outch < 0)
return;
if (!proc_decode_coding_system[inch])
proc_decode_coding_system[inch]
= (struct coding_system *) xmalloc (sizeof (struct coding_system));
coding_system = p->decode_coding_system;
if (! NILP (p->filter))
;
else if (BUFFERP (p->buffer))
{
if (NILP (XBUFFER (p->buffer)->enable_multibyte_characters))
coding_system = raw_text_coding_system (coding_system);
}
setup_coding_system (coding_system, proc_decode_coding_system[inch]);
if (!proc_encode_coding_system[outch])
proc_encode_coding_system[outch]
= (struct coding_system *) xmalloc (sizeof (struct coding_system));
setup_coding_system (p->encode_coding_system,
proc_encode_coding_system[outch]);
}
DEFUN ("processp", Fprocessp, Sprocessp, 1, 1, 0,
doc: /* Return t if OBJECT is a process. */)
......@@ -4113,31 +4081,6 @@ deactivate_process (Lisp_Object proc)
}
}
/* Close all descriptors currently in use for communication
with subprocess. This is used in a newly-forked subprocess
to get rid of irrelevant descriptors. */
void
close_process_descs (void)
{
#ifndef DOS_NT
int i;
for (i = 0; i < MAXDESC; i++)
{
Lisp_Object process;
process = chan_process[i];
if (!NILP (process))
{
int in = XPROCESS (process)->infd;
int out = XPROCESS (process)->outfd;
if (in >= 0)
emacs_close (in);
if (out >= 0 && in != out)
emacs_close (out);
}
}
#endif
}
DEFUN ("accept-process-output", Faccept_process_output, Saccept_process_output,
0, 4, 0,
......@@ -7208,6 +7151,67 @@ wait_reading_process_output (time_limit, microsecs, read_kbd, do_display,
/* The following functions are needed even if async subprocesses are
not supported. Some of them are no-op stubs in that case. */
/* Setup coding systems of PROCESS. */
void
setup_process_coding_systems (Lisp_Object process)
{
#ifdef subprocesses
struct Lisp_Process *p = XPROCESS (process);
int inch = p->infd;
int outch = p->outfd;
Lisp_Object coding_system;
if (inch < 0 || outch < 0)
return;
if (!proc_decode_coding_system[inch])
proc_decode_coding_system[inch]
= (struct coding_system *) xmalloc (sizeof (struct coding_system));
coding_system = p->decode_coding_system;
if (! NILP (p->filter))
;
else if (BUFFERP (p->buffer))
{
if (NILP (XBUFFER (p->buffer)->enable_multibyte_characters))
coding_system = raw_text_coding_system (coding_system);
}
setup_coding_system (coding_system, proc_decode_coding_system[inch]);
if (!proc_encode_coding_system[outch])
proc_encode_coding_system[outch]
= (struct coding_system *) xmalloc (sizeof (struct coding_system));
setup_coding_system (p->encode_coding_system,
proc_encode_coding_system[outch]);
#endif
}
/* Close all descriptors currently in use for communication
with subprocess. This is used in a newly-forked subprocess
to get rid of irrelevant descriptors. */
void
close_process_descs (void)
{
#ifndef DOS_NT
int i;
for (i = 0; i < MAXDESC; i++)
{
Lisp_Object process;
process = chan_process[i];
if (!NILP (process))
{
int in = XPROCESS (process)->infd;
int out = XPROCESS (process)->outfd;
if (in >= 0)
emacs_close (in);
if (out >= 0 && in != out)
emacs_close (out);
}
}
#endif
}
DEFUN ("get-buffer-process", Fget_buffer_process, Sget_buffer_process, 1, 1, 0,
doc: /* Return the (or a) process associated with BUFFER.
BUFFER may be a buffer or the name of one. */)
......
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