ben 99/09/12 04:06:27
Modified: src/lib/apr/locks/unix locks.c locks.h
src/lib/apr/threadproc/unix procsup.c thread.c
threadcancel.c threadpriv.c
Log:
Fix warnings.
Revision Changes Path
1.2 +1 -0 apache-2.0/src/lib/apr/locks/unix/locks.c
Index: locks.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locks.c 1999/08/17 15:59:42 1.1
+++ locks.c 1999/09/12 11:06:25 1.2
@@ -55,6 +55,7 @@
#include "apr_general.h"
#include "apr_portable.h"
+#include "apr_lib.h"
#include "locks.h"
#include <string.h>
1.2 +13 -0 apache-2.0/src/lib/apr/locks/unix/locks.h
Index: locks.h
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locks.h 1999/08/17 15:59:42 1.1
+++ locks.h 1999/09/12 11:06:25 1.2
@@ -108,5 +108,18 @@
*/
};
+ap_status_t create_intra_lock(struct lock_t *new);
+ap_status_t lock_intra(struct lock_t *lock);
+ap_status_t unlock_intra(struct lock_t *lock);
+ap_status_t destroy_intra_lock(struct lock_t *lock);
+
+ap_status_t create_inter_lock(struct lock_t *new);
+ap_status_t lock_inter(struct lock_t *lock);
+ap_status_t unlock_inter(struct lock_t *lock);
+ap_status_t destroy_inter_lock(struct lock_t *lock);
+
+ap_status_t child_init_lock(ap_context_t *cont, char *fname,
+ struct lock_t **lock);
+
#endif /* LOCKS_H */
1.2 +2 -0 apache-2.0/src/lib/apr/threadproc/unix/procsup.c
Index: procsup.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/threadproc/unix/procsup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- procsup.c 1999/08/17 15:59:50 1.1
+++ procsup.c 1999/09/12 11:06:26 1.2
@@ -128,6 +128,8 @@
if (freopen("/dev/null", "w", stderr) == NULL) {
return APR_STDERR;
}
+
+ return APR_SUCCESS;
}
/* ***APRDOC********************************************************
1.2 +2 -0 apache-2.0/src/lib/apr/threadproc/unix/thread.c
Index: thread.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/threadproc/unix/thread.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thread.c 1999/08/17 15:59:50 1.1
+++ thread.c 1999/09/12 11:06:26 1.2
@@ -57,6 +57,7 @@
#include "apr_thread_proc.h"
#include "apr_general.h"
#include "apr_portable.h"
+#include "apr_lib.h"
#ifdef HAVE_PTHREAD_H
/* ***APRDOC********************************************************
@@ -179,6 +180,7 @@
{
ap_destroy_pool(thd->cntxt);
pthread_exit(retval);
+ return APR_SUCCESS;
}
/* ***APRDOC********************************************************
1.2 +3 -0 apache-2.0/src/lib/apr/threadproc/unix/threadcancel.c
Index: threadcancel.c
===================================================================
RCS file:
/export/home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadcancel.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- threadcancel.c 1999/08/17 15:59:50 1.1
+++ threadcancel.c 1999/09/12 11:06:26 1.2
@@ -58,6 +58,8 @@
#include "apr_general.h"
#ifdef HAVE_PTHREAD_H
+
+#if 0 /* some platforms, e.g. FreeBSD 2.2.8, do not have pthread_cancel
(they do have an undocumented pthread_kill, though) */
/* ***APRDOC********************************************************
* ap_status_t ap_cancel_thread(ap_thread_t *)
* Asynchronously kill a thread
@@ -73,6 +75,7 @@
return stat;
}
}
+#endif
/* ***APRDOC********************************************************
* ap_status_t ap_setcanceltype(ap_context_t *, ap_int32_t)
1.2 +1 -0 apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c
Index: threadpriv.c
===================================================================
RCS file:
/export/home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- threadpriv.c 1999/08/17 15:59:50 1.1
+++ threadpriv.c 1999/09/12 11:06:27 1.2
@@ -58,6 +58,7 @@
#include "apr_general.h"
#include "apr_errno.h"
#include "apr_portable.h"
+#include "apr_lib.h"
#ifdef HAVE_PTHREAD_H
/* ***APRDOC********************************************************
