#else /* not NO_SUBPROCESSES */
-/* Only process.c needs to know about the guts of this */
+/* struct Lisp_Process is defined in procimpl.h; only process-*.c need
+ to know about the guts of it. */
DECLARE_LRECORD (process, Lisp_Process);
#define XPROCESS(x) XRECORD (x, process, Lisp_Process)
#define XSETPROCESS(x, p) XSETRECORD (x, p, process)
#define PROCESSP(x) RECORDP (x, process)
#define CHECK_PROCESS(x) CHECK_RECORD (x, process)
-#define PROCESS_LIVE_P(x) (!NILP ((x)->pipe_instream))
+#define PROCESS_LIVE_P(x) (EQ ((x)->status_symbol, Qrun))
+#define PROCESS_READABLE_P(x) (!NILP ((x)->pipe_instream))
#define CHECK_LIVE_PROCESS(x) do { \
CHECK_PROCESS (x); \
dead_wrong_type_argument (Qprocess_live_p, (x)); \
} while (0)
+#define CHECK_READABLE_PROCESS(x) do { \
+ CHECK_PROCESS (x); \
+ if (! PROCESS_READABLE_P (XPROCESS (x))) \
+ dead_wrong_type_argument (Qprocess_readable_p, (x)); \
+} while (0)
+
#ifdef emacs
EXFUN (Fprocess_kill_without_query, 2);
extern volatile int synch_process_alive;
/* Nonzero => this is a string explaining death of synchronous subprocess. */
-extern CONST char *synch_process_death;
+extern const char *synch_process_death;
/* If synch_process_death is zero,
this is exit code of synchronous subprocess. */
void deactivate_process (Lisp_Object proc);
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
int
#else
void
#endif
child_setup (int in, int out, int err,
- char **new_argv, CONST char *current_dir);
+ char **new_argv, const char *current_dir);
Charcount read_process_output (Lisp_Object proc);
-CONST char *signal_name (int signum);
+const char *signal_name (int signum);
Lisp_Object canonicalize_host_name (Lisp_Object host);
#endif /* emacs */
-#ifdef HAVE_GETPT
-#define PTY_ITERATION
-#define PTY_OPEN \
- if ((fd = getpt()) < 0 || grantpt (fd) < 0 || unlockpt (fd) < 0) \
- return -1;
-#define PTY_NAME_SPRINTF
-#define PTY_TTY_NAME_SPRINTF strcpy (pty_name, ptsname (fd));
-#endif
-
#endif /* INCLUDED_process_h_ */