From 12e4be290d41bdc06599679d61c80d28c3d3cf35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 5 Sep 2006 09:53:20 +0000 Subject: [PATCH] cleanup git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18746 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/file_systems/iso9660/iso.c | 1 - .../file_systems/iso9660/kernel_interface.cpp | 1 - .../kernel/file_systems/iso9660/lock.h | 32 ------------------- 3 files changed, 34 deletions(-) delete mode 100644 src/add-ons/kernel/file_systems/iso9660/lock.h diff --git a/src/add-ons/kernel/file_systems/iso9660/iso.c b/src/add-ons/kernel/file_systems/iso9660/iso.c index 3a3f5766f1..4564f4c244 100644 --- a/src/add-ons/kernel/file_systems/iso9660/iso.c +++ b/src/add-ons/kernel/file_systems/iso9660/iso.c @@ -23,7 +23,6 @@ #include #include -#include "lock.h" #include "rock.h" #include "iso.h" diff --git a/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp b/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp index e0e59f0d12..1f28d913bc 100644 --- a/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp @@ -33,7 +33,6 @@ #include -#include "lock.h" #include "iso.h" #include "iso9660.h" diff --git a/src/add-ons/kernel/file_systems/iso9660/lock.h b/src/add-ons/kernel/file_systems/iso9660/lock.h deleted file mode 100644 index d2941ead29..0000000000 --- a/src/add-ons/kernel/file_systems/iso9660/lock.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef _LOCK_H -#define _LOCK_H - -#include - -#include - -typedef struct lock lock; -typedef struct mlock mlock; - -struct lock { - sem_id s; - long c; -}; - -struct mlock { - sem_id s; -}; - -extern _IMPEXP_KERNEL int new_lock(lock *l, const char *name); -extern _IMPEXP_KERNEL int free_lock(lock *l); - -#define LOCK(l) if (atomic_add(&l.c, -1) <= 0) acquire_sem(l.s); -#define UNLOCK(l) if (atomic_add(&l.c, 1) < 0) release_sem(l.s); - -extern _IMPEXP_KERNEL int new_mlock(mlock *l, long c, const char *name); -extern _IMPEXP_KERNEL int free_mlock(mlock *l); - -#define LOCKM(l,cnt) acquire_sem_etc(l.s, cnt, 0, 0) -#define UNLOCKM(l,cnt) release_sem_etc(l.s, cnt, 0) - -#endif