diff options
| author | bunnei <bunneidev@gmail.com> | 2014-11-19 15:24:46 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-11-19 15:24:46 -0500 |
| commit | c0cd0fa78edc37795176c6fb45a52c1d015f3690 (patch) | |
| tree | 237f15dd9d986309000c995fde07088625e62239 /src/core/hle/kernel/shared_memory.h | |
| parent | 112768f4365816d345b0dc9b93bfecc3d41a69b5 (diff) | |
| parent | 739bb58c3a92ba94baeaa2156dc72fb7ff0ce8b7 (diff) | |
Merge pull request #211 from linkmauve/master
Remove trailing spaces from the entire project
Diffstat (limited to 'src/core/hle/kernel/shared_memory.h')
| -rw-r--r-- | src/core/hle/kernel/shared_memory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/shared_memory.h b/src/core/hle/kernel/shared_memory.h index 5312b8854..0aec03538 100644 --- a/src/core/hle/kernel/shared_memory.h +++ b/src/core/hle/kernel/shared_memory.h @@ -1,6 +1,6 @@ // Copyright 2014 Citra Emulator Project // Licensed under GPLv2 -// Refer to the license.txt file included. +// Refer to the license.txt file included. #pragma once @@ -34,7 +34,7 @@ Handle CreateSharedMemory(const std::string& name="Unknown"); * @param other_permissions Memory block map other permissions (specified by SVC field) * @return Result of operation, 0 on success, otherwise error code */ -Result MapSharedMemory(u32 handle, u32 address, MemoryPermission permissions, +Result MapSharedMemory(u32 handle, u32 address, MemoryPermission permissions, MemoryPermission other_permissions); /** |