summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2016-07-07 23:27:42 +0200
committerGitHub <noreply@github.com>2016-07-07 23:27:42 +0200
commitf1e1910ae435c255745773bf37a60d798f9412fb (patch)
tree7e028a2da14765378e5eee7f71b434bde5038705 /platform
parent1b9433594ecc6c935c81e9030a6b52c7b56cb3a4 (diff)
parent454b210242ec15a9928324757f27989216bc5a59 (diff)
Merge pull request #5538 from akien-mga/pr-unused-var
Removed unused variables + dead code
Diffstat (limited to 'platform')
-rw-r--r--platform/bb10/export/export.cpp1
-rw-r--r--platform/x11/joystick_linux.cpp3
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/bb10/export/export.cpp b/platform/bb10/export/export.cpp
index 7cb0aa3607..14d87aef41 100644
--- a/platform/bb10/export/export.cpp
+++ b/platform/bb10/export/export.cpp
@@ -714,7 +714,6 @@ Error EditorExportPlatformBB10::run(int p_device, int p_flags) {
args.push_back("-installApp");
args.push_back("-launchApp");
args.push_back("-device");
- int idx = devices[p_device].index;
String host = EditorSettings::get_singleton()->get("blackberry/device_"+itos(p_device+1)+"/host");
String pass = EditorSettings::get_singleton()->get("blackberry/device_"+itos(p_device+1)+"/password");
args.push_back(host);
diff --git a/platform/x11/joystick_linux.cpp b/platform/x11/joystick_linux.cpp
index 82f79c2640..4a6a4f3a52 100644
--- a/platform/x11/joystick_linux.cpp
+++ b/platform/x11/joystick_linux.cpp
@@ -45,7 +45,9 @@
#define test_bit(nr, addr) (((1UL << ((nr) % LONG_BITS)) & ((addr)[(nr) / LONG_BITS])) != 0)
#define NBITS(x) ((((x)-1)/LONG_BITS)+1)
+#ifdef UDEV_ENABLED
static const char* ignore_str = "/dev/input/js";
+#endif
joystick_linux::Joystick::Joystick() {
fd = -1;
@@ -198,7 +200,6 @@ void joystick_linux::monitor_joysticks(udev *p_udev) {
}
usleep(50000);
}
- //printf("exit udev\n");
udev_monitor_unref(mon);
}
#endif