From af489285b902ce6518add5b4b3364a5688a8873a Mon Sep 17 00:00:00 2001
From: Urias McCullough <umccullough@gmail.com>
Date: Sat, 28 Jan 2012 21:11:08 -0800
Subject: [PATCH 3/5] Conditionally set DEBUG in touchpad preferences if it isn't already defined
* This allows building with DEBUG=2 and avoiding warnings.
---
src/preferences/touchpad/TouchpadPref.h | 4 +++-
src/preferences/touchpad/TouchpadPrefView.h | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/preferences/touchpad/TouchpadPref.h b/src/preferences/touchpad/TouchpadPref.h
index 1bfe452..d2165a9 100644
a
|
b
|
|
8 | 8 | #ifndef TOUCHPAD_PREF_H |
9 | 9 | #define TOUCHPAD_PREF_H |
10 | 10 | |
| 11 | #ifndef DEBUG |
| 12 | #define DEBUG 1 |
| 13 | #endif |
11 | 14 | |
12 | | #define DEBUG 1 |
13 | 15 | #include <Debug.h> |
14 | 16 | |
15 | 17 | #include "touchpad_settings.h" |
diff --git a/src/preferences/touchpad/TouchpadPrefView.h b/src/preferences/touchpad/TouchpadPrefView.h
index 6e52598..ae5eba5 100644
a
|
b
|
|
20 | 20 | #include "TouchpadPref.h" |
21 | 21 | #include "touchpad_settings.h" |
22 | 22 | |
23 | | #define DEBUG 1 |
| 23 | #ifndef DEBUG |
| 24 | #define DEBUG 1 |
| 25 | #endif |
| 26 | |
24 | 27 | #include <Debug.h> |
25 | 28 | |
26 | 29 | #if DEBUG |