Update the include files inline with the recent changes to locking

code on beos.


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

2 files changed, 5 insertions, 25 deletions

diff --git a/include/apr_portable.h b/include/apr_portable.h
index 17ed5bd3a..7ce68513d 100644
--- a/include/apr_portable.h
+++ b/include/apr_portable.h
@@ -120,12 +120,8 @@ typedef HMODULE               apr_os_dso_handle_t;
 #include <kernel/image.h>
 
 struct apr_os_lock_t {
-	/* Inter proc */
-	sem_id sem_interproc;
-	int32  ben_interproc;
-	/* Intra Proc */
-	sem_id sem_intraproc;
-	int32  ben_intraproc;
+	sem_id sem;
+	int32  ben;
 };
 
 typedef int                   apr_os_file_t;
diff --git a/include/arch/beos/locks.h b/include/arch/beos/locks.h
index 66f3e0090..8e332600f 100644
--- a/include/arch/beos/locks.h
+++ b/include/arch/beos/locks.h
@@ -68,26 +68,10 @@ struct apr_lock_t {
     apr_lockscope_e scope;
     apr_os_thread_t owner;
     int owner_ref;
-    /* Inter proc */
-    sem_id sem_interproc;
-    int32  ben_interproc;
-    /* Intra Proc */
-    sem_id sem_intraproc;
-    int32  ben_intraproc;
-};
-
-apr_status_t create_intra_lock(struct apr_lock_t *new);
-apr_status_t lock_intra(struct apr_lock_t *lock);
-apr_status_t unlock_intra(struct apr_lock_t *lock);
-apr_status_t destroy_intra_lock(struct apr_lock_t *lock);
 
-apr_status_t create_inter_lock(struct apr_lock_t *new);
-apr_status_t lock_inter(struct apr_lock_t *lock);
-apr_status_t unlock_inter(struct apr_lock_t *lock);
-apr_status_t destroy_inter_lock(struct apr_lock_t *lock);
-
-apr_status_t child_init_lock(struct apr_lock_t **lock, apr_pool_t *cont, 
-                            const char *fname);
+    sem_id sem;
+    int32  ben;
+};
 
 #endif  /* LOCKS_H */