You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/07/11 01:35:31 UTC
cvs commit: apache-2.0/src/lib/apr/threadproc/win32 thread.c
rbb 00/07/10 16:35:31
Modified: src/lib/apr/include apr_portable.h
src/lib/apr/threadproc/unix thread.c
src/lib/apr/threadproc/win32 thread.c
Log:
Fix ap_get_os_thread. This should work on Windows and Unix now.
Revision Changes Path
1.35 +1 -1 apache-2.0/src/lib/apr/include/apr_portable.h
Index: apr_portable.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- apr_portable.h 2000/06/19 17:53:12 1.34
+++ apr_portable.h 2000/07/10 23:35:30 1.35
@@ -262,7 +262,7 @@
#if APR_HAS_THREADS
/*
-=head1 ap_status_t ap_get_os_thread(ap_thread_t *thethd, ap_os_thread_t *thd)
+=head1 ap_status_t ap_get_os_thread(ap_thread_t **thethd, ap_os_thread_t *thd)
B<convert the thread to os specific type from apr type.>
1.27 +2 -3 apache-2.0/src/lib/apr/threadproc/unix/thread.c
Index: thread.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/thread.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- thread.c 2000/07/08 11:31:49 1.26
+++ thread.c 2000/07/10 23:35:31 1.27
@@ -196,10 +196,9 @@
return ap_set_userdata(data, key, cleanup, thread->cntxt);
}
-ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, ap_thread_t *thd)
+ap_status_t ap_get_os_thread(ap_os_thread_t **thethd, ap_thread_t *thd)
{
- /* ### broken. is the signature broken? */
- thethd = thd->td;
+ *thethd = thd->td;
return APR_SUCCESS;
}
1.22 +2 -3 apache-2.0/src/lib/apr/threadproc/win32/thread.c
Index: thread.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/thread.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- thread.c 2000/07/08 11:31:49 1.21
+++ thread.c 2000/07/10 23:35:31 1.22
@@ -168,13 +168,12 @@
return ap_set_userdata(data, key, cleanup, thread->cntxt);
}
-ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, ap_thread_t *thd)
+ap_status_t ap_get_os_thread(ap_os_thread_t **thethd, ap_thread_t *thd)
{
if (thd == NULL) {
return APR_ENOTHREAD;
}
- /* ### this is broken. is the signature broken? */
- thethd = thd->td;
+ *thethd = thd->td;
return APR_SUCCESS;
}