diff options
| author | bunnei <bunneidev@gmail.com> | 2018-01-16 17:23:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-16 17:23:33 -0500 |
| commit | 52fe15278b812a2518dd874f29c0829b221fd70f (patch) | |
| tree | 6bf8782b9338d94938e4060c8a3c88855d68ee75 /src/core/hle/service | |
| parent | f10a7081e38419effd0ca6d6b9679310de47b867 (diff) | |
| parent | e35644c00533c797888a23420aae90b07e0da184 (diff) | |
Merge pull request #47 from MerryMage/build-fixes
Misc build fixes
Diffstat (limited to 'src/core/hle/service')
| -rw-r--r-- | src/core/hle/service/apm/apm.cpp | 3 | ||||
| -rw-r--r-- | src/core/hle/service/nvdrv/nvdrv.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/apm/apm.cpp b/src/core/hle/service/apm/apm.cpp index f70b9fc10..957abdd66 100644 --- a/src/core/hle/service/apm/apm.cpp +++ b/src/core/hle/service/apm/apm.cpp @@ -15,8 +15,7 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { APM::APM() : ServiceFramework("apm") { static const FunctionInfo functions[] = { - {0x00000000, nullptr, "OpenSession"}, - {0x00000001, nullptr, "GetPerformanceMode"}, + {0x00000000, nullptr, "OpenSession"}, {0x00000001, nullptr, "GetPerformanceMode"}, }; RegisterHandlers(functions); } diff --git a/src/core/hle/service/nvdrv/nvdrv.h b/src/core/hle/service/nvdrv/nvdrv.h index 7530d80ad..a1c050416 100644 --- a/src/core/hle/service/nvdrv/nvdrv.h +++ b/src/core/hle/service/nvdrv/nvdrv.h @@ -26,6 +26,7 @@ public: VAddr GetObjectAddress(u32 handle) const; u32 ioctl(u32 command, const std::vector<u8>& input, std::vector<u8>& output) override; + private: // Represents an nvmap object. struct Object { |