summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-03-17 21:58:44 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-03-17 21:58:44 -0700
commit6bd8c14466b0787f9675279727efdff93bced7bb (patch)
tree72710babd2dca83fc0c189c489d99f0c98c85836
parentcb1d0ef7c91692a70f3628c5b33095e48f325250 (diff)
* lisp.h (child_setup): Now NO_RETURN unless DOS_NT.
This should get cleaned up, so that child_setup has the same signature on all platforms.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/lisp.h6
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1d27999b49d..da9676233e0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
2011-03-18 Paul Eggert <eggert@cs.ucla.edu>
+ * lisp.h (child_setup): Now NO_RETURN unless DOS_NT.
+ This should get cleaned up, so that child_setup has the
+ same signature on all platforms.
+
* callproc.c (call_process_cleanup): Now static.
(relocate_fd): Rename locals to avoid shadowing.
diff --git a/src/lisp.h b/src/lisp.h
index 283b0989c1d..645b82c80cf 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3233,7 +3233,11 @@ extern void syms_of_process (void);
extern void setup_process_coding_systems (Lisp_Object);
EXFUN (Fcall_process, MANY);
-extern int child_setup (int, int, int, char **, int, Lisp_Object);
+extern int child_setup (int, int, int, char **, int, Lisp_Object)
+#ifndef DOS_NT
+ NO_RETURN
+#endif
+ ;
extern void init_callproc_1 (void);
extern void init_callproc (void);
extern void set_initial_environment (void);