diff options
author | 2014-06-14 12:13:16 -0400 | |
---|---|---|
committer | 2014-06-14 12:13:16 -0400 | |
commit | 004df767953a949817da89bddcd5d1379240f769 (patch) | |
tree | b2d54928dcbf3cb4dde0cd5d3277afe7999b7bd9 /src/core/hle/kernel/mutex.h | |
parent | c34ba380011921a9d984136381c3a65a1e2389d5 (diff) | |
parent | b45a38f55794e47b0429a8667441a20433e19e42 (diff) |
Merge branch 'threading' of https://github.com/bunnei/citra
Conflicts:
src/core/hle/function_wrappers.h
src/core/hle/service/gsp.cpp
Diffstat (limited to 'src/core/hle/kernel/mutex.h')
-rw-r--r-- | src/core/hle/kernel/mutex.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/hle/kernel/mutex.h b/src/core/hle/kernel/mutex.h index 871e2e56..7d7b5137 100644 --- a/src/core/hle/kernel/mutex.h +++ b/src/core/hle/kernel/mutex.h @@ -13,14 +13,16 @@ namespace Kernel { /** * Releases a mutex * @param handle Handle to mutex to release + * @return Result of operation, 0 on success, otherwise error code */ Result ReleaseMutex(Handle handle); /** * Creates a mutex - * @param handle Reference to handle for the newly created mutex * @param initial_locked Specifies if the mutex should be locked initially + * @param name Optional name of mutex + * @return Handle to newly created object */ -Handle CreateMutex(bool initial_locked); +Handle CreateMutex(bool initial_locked, const std::string& name="Unknown"); } // namespace |