** DEPRECATE old lock API: apr_lock.h **

Resolve some circular includes (apr_thread_mutex.h needs apr_pools.h needs
apr_allocator.h needs apr_thread_mutex.h ...).

Remove all apr_lock.h related files (incl. arch-specific headers and
implementations).


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@63234 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 29 deletions

diff --git a/include/apr_portable.h b/include/apr_portable.h
index 6e6611924..35648dc06 100644
--- a/include/apr_portable.h
+++ b/include/apr_portable.h
@@ -74,7 +74,6 @@
 #include "apr_file_io.h"
 #include "apr_network_io.h"
 #include "apr_errno.h"
-#include "apr_lock.h"
 #include "apr_proc_mutex.h"
 #include "apr_time.h"
 #include "apr_dso.h"
@@ -99,8 +98,6 @@ extern "C" {
 typedef HANDLE                apr_os_file_t;
 typedef HANDLE                apr_os_dir_t;
 typedef SOCKET                apr_os_sock_t;
-/* We're deprecating apr_lock_t, so apr_os_lock_t will be gone too. */
-typedef HANDLE                apr_os_lock_t;
 typedef HANDLE                apr_os_proc_mutex_t;
 typedef HANDLE                apr_os_thread_t;
 typedef HANDLE                apr_os_proc_t;
@@ -114,8 +111,6 @@ typedef HANDLE                apr_os_shm_t;
 typedef HFILE                 apr_os_file_t;
 typedef HDIR                  apr_os_dir_t;
 typedef int                   apr_os_sock_t;
-/* We're deprecating apr_lock_t, so apr_os_lock_t will be gone too. */
-typedef HMTX                  apr_os_lock_t;
 typedef HMTX                  apr_os_proc_mutex_t;
 typedef TID                   apr_os_thread_t;
 typedef PID                   apr_os_proc_t;
@@ -137,8 +132,6 @@ struct apr_os_proc_mutex_t {
 typedef int                   apr_os_file_t;
 typedef DIR                   apr_os_dir_t;
 typedef int                   apr_os_sock_t;
-/* We're deprecating apr_lock_t, so apr_os_lock_t will be gone too. */
-typedef struct apr_os_proc_mutex_t  apr_os_lock_t;
 typedef struct apr_os_proc_mutex_t  apr_os_proc_mutex_t;
 typedef thread_id             apr_os_thread_t;
 typedef thread_id             apr_os_proc_t;
@@ -152,8 +145,6 @@ typedef void*                 apr_os_shm_t;
 typedef int                   apr_os_file_t;
 typedef DIR                   apr_os_dir_t;
 typedef int                   apr_os_sock_t;
-/* We're deprecating apr_lock_t, so apr_os_lock_t will be gone too. */
-typedef NXMutex_t             apr_os_lock_t;
 typedef NXMutex_t             apr_os_proc_mutex_t;
 typedef NXThreadId_t          apr_os_thread_t;
 typedef long                  apr_os_proc_t;
@@ -186,8 +177,6 @@ struct apr_os_proc_mutex_t {
 typedef int                   apr_os_file_t;
 typedef DIR                   apr_os_dir_t;
 typedef int                   apr_os_sock_t;
-/* We're deprecating apr_lock_t, so apr_os_lock_t will be gone too. */
-typedef struct apr_os_proc_mutex_t  apr_os_lock_t;
 typedef struct apr_os_proc_mutex_t  apr_os_proc_mutex_t;
 #if APR_HAS_THREADS && APR_HAVE_PTHREAD_H 
 typedef pthread_t             apr_os_thread_t;
@@ -255,14 +244,6 @@ APR_DECLARE(apr_status_t) apr_os_sock_get(apr_os_sock_t *thesock,
                                           apr_socket_t *sock);
 
 /**
- * Convert the lock from os specific type to apr type
- * @param oslock The os specific lock we are converting to.
- * @param lock The apr lock to convert.
- */
-APR_DECLARE(apr_status_t) apr_os_lock_get(apr_os_lock_t *oslock, 
-                                          apr_lock_t *lock);
-
-/**
  * Convert the proc mutex from os specific type to apr type
  * @param ospmutex The os specific proc mutex we are converting to.
  * @param pmutex The apr proc mutex to convert.
@@ -398,16 +379,6 @@ APR_DECLARE(apr_status_t) apr_os_sock_make(apr_socket_t **apr_sock,
                                            apr_pool_t *cont);
 
 /**
- * Convert the lock from os specific type to apr type
- * @param lock The apr lock we are converting to.
- * @param thelock The os specific lock to convert.
- * @param cont The pool to use if it is needed.
- */
-APR_DECLARE(apr_status_t) apr_os_lock_put(apr_lock_t **lock,
-                                          apr_os_lock_t *thelock,
-                                          apr_pool_t *cont); 
-
-/**
  * Convert the proc mutex from os specific type to apr type
  * @param pmutex The apr proc mutex we are converting to.
  * @param ospmutex The os specific proc mutex to convert.