dreid 99/10/08 04:22:54
Modified: src/lib/apr/threadproc/beos Makefile.in procsup.c Log: Bring the userdata functions back in line and correct a small error in the makefile.in related to the removal of the file_io/beos files. Revision Changes Path 1.4 +1 -1 apache-2.0/src/lib/apr/threadproc/beos/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.in 1999/09/10 14:00:46 1.3 +++ Makefile.in 1999/10/08 11:22:53 1.4 @@ -10,7 +10,7 @@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../inc INCDIR1=../../include -INCDIR2=../../file_io/@OSDIR@ +INCDIR2=../../file_io/unix INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I. LIB=libthreadproc.a 1.3 +5 -4 apache-2.0/src/lib/apr/threadproc/beos/procsup.c Index: procsup.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/procsup.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- procsup.c 1999/10/04 16:37:30 1.2 +++ procsup.c 1999/10/08 11:22:53 1.3 @@ -97,10 +97,10 @@ } } -ap_status_t ap_get_procdata(struct proc_t *proc, void *data) +ap_status_t ap_get_procdata(struct proc_t *proc, char *key, void *data) { if (proc != NULL) { - return ap_get_userdata(proc->cntxt, &data); + return ap_get_userdata(&data, proc->cntxt, key); } else { data = NULL; @@ -108,10 +108,11 @@ } } -ap_status_t ap_set_procdata(struct proc_t *proc, void *data) +ap_status_t ap_set_procdata(struct proc_t *proc, void *data, char *key, + ap_status_t (*cleanup) (void *)) { if (proc != NULL) { - return ap_set_userdata(proc->cntxt, data); + return ap_set_userdata(proc->cntxt, data, key, cleanup); } else { data = NULL;