roll the extra apr_lock_create_np() functionality into apr_lock_create()

and get rid of apr_lock_create_np(); apr_lock_create() has a new
parameter for specifying the lock mechanism (or APR_LOCK_DEFAULT to let
APR choose)

(same for apr_proc_mutex_create_np() and apr_proc_mutex_create())


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

2 files changed, 6 insertions, 9 deletions

diff --git a/locks/netware/locks.c b/locks/netware/locks.c
index 71bf356e7..0238761db 100644
--- a/locks/netware/locks.c
+++ b/locks/netware/locks.c
@@ -76,7 +76,7 @@ static apr_status_t lock_cleanup(void *lock_)
 }
 
 apr_status_t apr_lock_create(apr_lock_t **lock, apr_locktype_e type, apr_lockscope_e scope, 
-                                          const char *fname, apr_pool_t *pool)
+                             apr_lockmech_e mech, const char *fname, apr_pool_t *pool)
 {
    
     apr_lock_t *newlock = NULL;
@@ -95,6 +95,10 @@ apr_status_t apr_lock_create(apr_lock_t **lock, apr_locktype_e type, apr_locksco
     apr_status_t status;
     long flags = 0;
 
+    if (mech != APR_LOCK_DEFAULT) {
+        return APR_ENOTIMPL;
+    }
+
     newlock = (apr_lock_t *)apr_palloc(pool, sizeof(apr_lock_t));
 	
 	if(newlock ==NULL) {
diff --git a/locks/netware/proc_mutex.c b/locks/netware/proc_mutex.c
index b8d02663c..190332893 100644
--- a/locks/netware/proc_mutex.c
+++ b/locks/netware/proc_mutex.c
@@ -61,19 +61,12 @@
 
 APR_DECLARE(apr_status_t) apr_proc_mutex_create(apr_proc_mutex_t **mutex,
                                                 const char *fname,
+                                                apr_lockmech_e mech,
                                                 apr_pool_t *pool)
 {
     return APR_ENOTIMPL;
 }
 
-APR_DECLARE(apr_status_t) apr_proc_mutex_create_np(apr_proc_mutex_t **mutex,
-                                                   const char *fname,
-                                                   apr_lockmech_e_np mech,
-                                                   apr_pool_t *pool)
-{
-    return APR_ENOTIMPL;
-}       
-
 APR_DECLARE(apr_status_t) apr_proc_mutex_child_init(apr_proc_mutex_t **mutex,
                                                     const char *fname,
                                                     apr_pool_t *pool)