aboutsummaryrefslogtreecommitdiffstats
path: root/execute.h
diff options
context:
space:
mode:
authorwrog <wrog>2004-05-22 01:25:43 +0000
committerwrog <wrog>2004-05-22 01:25:43 +0000
commiteb039bfdc08bd288a779014d4f0216048c789a70 (patch)
tree7851d677083d0756f183aae465eed9b6bd8a5c57 /execute.h
parent9305c9aa5c57241080e5d0c9029498234def197a (diff)
downloadmoo-cvs-eb039bfdc08bd288a779014d4f0216048c789a70.tar.gz
moo-cvs-eb039bfdc08bd288a779014d4f0216048c789a70.tar.xz
moo-cvs-eb039bfdc08bd288a779014d4f0216048c789a70.zip
merging in WROGUE changes (W_SRCIP, W_STARTUP, W_OOB)
Diffstat (limited to 'execute.h')
-rw-r--r--execute.h22
1 files changed, 14 insertions, 8 deletions
diff --git a/execute.h b/execute.h
index ec6d594..e394a62 100644
--- a/execute.h
+++ b/execute.h
@@ -70,10 +70,6 @@ typedef struct {
typedef vmstruct *vm;
-typedef enum {
- TASK_INPUT, TASK_FORKED, TASK_SUSPENDED
-} task_kind;
-
#define alloc_data(size) mymalloc(size, M_BI_FUNC_DATA)
#define free_data(ptr) myfree((void *) ptr, M_BI_FUNC_DATA)
@@ -96,13 +92,13 @@ enum outcome {
};
extern enum outcome do_forked_task(Program * prog, Var * rt_env,
- activation a, int f_id, Var * result);
+ activation a, int f_id);
extern enum outcome do_input_task(Objid user, Parsed_Command * pc,
Objid this, db_verb_handle vh);
extern enum outcome do_server_verb_task(Objid this, const char *verb,
Var args, db_verb_handle h,
Objid player, const char *argstr,
- Var * result, int do_db_tracebacks);
+ Var * result, int do_db_tracebacks);
extern enum outcome do_server_program_task(Objid this, const char *verb,
Var args, Objid vloc,
const char *verbname,
@@ -111,8 +107,7 @@ extern enum outcome do_server_program_task(Objid this, const char *verb,
const char *argstr,
Var * result,
int do_db_tracebacks);
-extern enum outcome resume_from_previous_vm(vm the_vm, Var value,
- task_kind tk, Var * result);
+extern enum outcome resume_from_previous_vm(vm the_vm, Var value);
extern int task_timed_out;
extern void abort_running_task(void);
@@ -135,6 +130,17 @@ extern int read_activ(activation * a, int which_vector);
/*
* $Log$
+ * Revision 1.8 2004/05/22 01:25:43 wrog
+ * merging in WROGUE changes (W_SRCIP, W_STARTUP, W_OOB)
+ *
+ * Revision 1.7.2.2 2003/06/07 13:14:24 wrog
+ * fix log entry
+ *
+ * Revision 1.7.2.1 2003/06/04 21:28:59 wrog
+ * removed useless arguments from resume_from_previous_vm(), do_forked_task();
+ * replaced current_task_kind with is_fg argument for do_task();
+ * made enum task_kind internal to tasks.c
+ *
* Revision 1.7 2002/09/15 23:21:01 xplat
* GNU indent normalization.
*