diff options
author | Egor Ananyin <ananinegor@gmail.com> | 2020-06-20 09:18:43 +0300 |
---|---|---|
committer | Egor Ananyin <ananinegor@gmail.com> | 2020-06-20 09:18:43 +0300 |
commit | abd2d1e16494867989e710e5235c6425fa4e8c34 (patch) | |
tree | 7eff3e1db566801104a8fc2672bbe57e06f7009e /arm9/lib/include/OS_mutex.h | |
parent | 70556fc300ba85dad248d20b3c79c415e2ef88e5 (diff) | |
parent | 12c17948602bf14535c91c530f214b99863e038e (diff) |
conflicts
Diffstat (limited to 'arm9/lib/include/OS_mutex.h')
-rw-r--r-- | arm9/lib/include/OS_mutex.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/arm9/lib/include/OS_mutex.h b/arm9/lib/include/OS_mutex.h index 0fc261a4..9da89c69 100644 --- a/arm9/lib/include/OS_mutex.h +++ b/arm9/lib/include/OS_mutex.h @@ -1,16 +1,10 @@ -#ifndef POKEDIAMOND_OS_MUTEX_H -#define POKEDIAMOND_OS_MUTEX_H +#ifndef POKEDIAMOND_ARM9_OS_MUTEX_H +#define POKEDIAMOND_ARM9_OS_MUTEX_H -#include "nitro/types.h" #include "OS_thread.h" - -struct OSMutex { - OSThreadQueue queue; - OSThread *thread; - s32 count; - OSMutexLink link; -}; +#include "OS_context.h" +#include "nitro/OS_mutex_shared.h" void OSi_UnlockAllMutex(OSThread * thread); -#endif //POKEDIAMOND_OS_MUTEX_H +#endif //POKEDIAMOND_ARM9_OS_MUTEX_H |