summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGravatar Zach Hilman2018-12-28 19:29:44 -0500
committerGravatar Zach Hilman2018-12-28 19:29:49 -0500
commit0c5ede492f8dd2e321bb237a56e7f38609541366 (patch)
treebc00e6bb78b9b60050f26dd632c4171e54ea8407 /src/core
parentweb_browser: Add bounds checking to applet interface (diff)
downloadyuzu-0c5ede492f8dd2e321bb237a56e7f38609541366.tar.gz
yuzu-0c5ede492f8dd2e321bb237a56e7f38609541366.tar.xz
yuzu-0c5ede492f8dd2e321bb237a56e7f38609541366.zip
travis: Use correct package for linux Qt5WebEngine
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/hid/hid.h4
-rw-r--r--src/core/hle/service/nfp/nfp.cpp1
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h
index 615d4e6d8..eca27c056 100644
--- a/src/core/hle/service/hid/hid.h
+++ b/src/core/hle/service/hid/hid.h
@@ -3,6 +3,8 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#pragma once 5#pragma once
6
7#include "controllers/controller_base.h"
6#include "core/hle/service/service.h" 8#include "core/hle/service/service.h"
7 9
8namespace CoreTiming { 10namespace CoreTiming {
@@ -19,8 +21,6 @@ class ServiceManager;
19 21
20namespace Service::HID { 22namespace Service::HID {
21 23
22class ControllerBase;
23
24enum class HidController : std::size_t { 24enum class HidController : std::size_t {
25 DebugPad, 25 DebugPad,
26 Touchscreen, 26 Touchscreen,
diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp
index a7bed0040..9ca5461db 100644
--- a/src/core/hle/service/nfp/nfp.cpp
+++ b/src/core/hle/service/nfp/nfp.cpp
@@ -11,7 +11,6 @@
11#include "core/hle/kernel/readable_event.h" 11#include "core/hle/kernel/readable_event.h"
12#include "core/hle/kernel/writable_event.h" 12#include "core/hle/kernel/writable_event.h"
13#include "core/hle/lock.h" 13#include "core/hle/lock.h"
14#include "core/hle/service/hid/hid.h"
15#include "core/hle/service/nfp/nfp.h" 14#include "core/hle/service/nfp/nfp.h"
16#include "core/hle/service/nfp/nfp_user.h" 15#include "core/hle/service/nfp/nfp_user.h"
17 16