dreid 01/06/11 04:41:15
Modified: include apr_portable.h
include/arch/beos locks.h
Log:
Update the include files inline with the recent changes to locking
code on beos.
Revision Changes Path
1.57 +2 -6 apr/include/apr_portable.h
Index: apr_portable.h
===================================================================
RCS file: /home/cvs/apr/include/apr_portable.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- apr_portable.h 2001/06/06 21:38:55 1.56
+++ apr_portable.h 2001/06/11 11:41:12 1.57
@@ -120,12 +120,8 @@
#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;
1.17 +3 -19 apr/include/arch/beos/locks.h
Index: locks.h
===================================================================
RCS file: /home/cvs/apr/include/arch/beos/locks.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- locks.h 2001/06/06 21:51:17 1.16
+++ locks.h 2001/06/11 11:41:14 1.17
@@ -68,26 +68,10 @@
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 */
