Index: ossp-pkg/act/act_ctx.c RCS File: /v/ossp/cvs/ossp-pkg/act/act_ctx.c,v rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/act/act_ctx.c,v' 2>/dev/null --- act_ctx.c 2000/08/18 15:58:08 1.3 +++ act_ctx.c 2000/08/18 21:49:23 1.4 @@ -29,22 +29,20 @@ #include "act_p.h" /* the value of a context entry */ -union act_ctx_value_un { +typedef union act_ctx_value_un { void *v_ptr; int v_int; long v_long; double v_double; -}; -typedef union act_ctx_value_un act_ctx_value_t; +} act_ctx_value_t; /* the context entry */ -struct act_ctx_entry_st { +typedef struct act_ctx_entry_st { unsigned int e_id; act_ctx_value_t e_value; -}; -typedef struct act_ctx_entry_st act_ctx_entry_t; +} act_ctx_entry_t; -/* the context */ +/* the context (already typedef'd in public header) */ struct act_ctx_st { act_ctx_entry_t c_entry[ACT_CTX_ENTRY_MAX+1]; }; @@ -86,13 +84,14 @@ return ctx; } -/* duplicate a new context structure (optionally with the help of a template) */ +/* duplicate a new context structure + (optionally with the help of a template) */ act_ctx_t *act_ctx_dup(act_ctx_t *ctx, act_ctx_t *ctx_template) { act_ctx_t *ctx_new; act_ctx_t *ctx_from; + int sp, lk, ty, no; int i; - int sp,lk,ty,no; if (ctx == NULL) return NULL; Index: ossp-pkg/act/act_ctx.h RCS File: /v/ossp/cvs/ossp-pkg/act/act_ctx.h,v rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/act/act_ctx.h,v' 2>/dev/null --- act_ctx.h 2000/08/18 15:58:08 1.3 +++ act_ctx.h 2000/08/18 21:49:23 1.4 @@ -91,7 +91,7 @@ typedef struct act_ctx_st act_ctx_t; /* the global default context */ -act_ctx_t *act_ctx_default; +act_ctx_t *act_ctx_default; /* the context API */ extern act_ctx_t *act_ctx_new (void);