* Don't define DEBUG in public headers!!! Doing it this way will break the

build for others, namely those that also include <Debug.h>
* This fixes the remaining problems of building Pe under Haiku.
* Those files need a giant style cleanup... Fredrik, time to have a look at
  our style guide :-)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26931 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/os/device/Joystick.h

@@ -16,8 +16,6 @@
 #include <SupportDefs.h>
 #include <OS.h>
 
-#define DEBUG
-
 class BList;
 class BString;
 struct entry_ref;
@@ -57,7 +55,7 @@ virtual				~BJoystick();
 		bool		button2;
 
 		int32		CountDevices();
-		status_t	GetDeviceName(int32 n, char * name, 
+		status_t	GetDeviceName(int32 n, char * name,
 						size_t bufSize = B_OS_NAME_LENGTH);
 
 		/* if you care about more than just the first two axes/buttons, here's where you go */
@@ -130,7 +128,7 @@ virtual	status_t	_Reserved_Joystick_6(void *, ...);
 		uint32		_reserved_Joystick_[10];
 #endif
 
-#ifdef DEBUG
+#if DEBUG
 public:
 	static FILE *sLogFile;
 #endif

headers/private/device/JoystickTweaker.h

@@ -1,14 +1,13 @@
 /*
- * Copyright 2008, Haiku.
+ * Copyright 2008, Haiku, Inc.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
- *		Fredrik Modeen 
- *
+ *		Fredrik Modeen
  */
- 
+
 #include "joystick_driver.h"
- 
+
 #include <List.h>
 #include <Entry.h>
 #include <Path.h>
@@ -22,8 +21,6 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#define DEBUG
-
 #define DEVICEPATH "/dev/joystick/"
 #define JOYSTICKPATH "/boot/home/config/settings/joysticks/"
 
@@ -47,8 +44,8 @@ private:
 		status_t	save_config(const entry_ref * ref = NULL);
 		status_t	get_info();
 		BJoystick* fJoystick;
-#ifdef DEBUG
+#if DEBUG
 public:
 	static FILE *sLogFile;
-#endif		
+#endif
 };