* 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;
@@ -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,10 +1,9 @@
 /*
- * Copyright 2008, Haiku.
+ * Copyright 2008, Haiku, Inc.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		Fredrik Modeen
- *
  */
 
 #include "joystick_driver.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,7 +44,7 @@ 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

src/kits/device/Joystick.cpp

@@ -25,14 +25,22 @@ __8JoyCalibG5BRectR9BJoystickP7BWindow:
 
 #include "Joystick.h"
 
-#ifdef DEBUG
-        inline void LOG(const char *fmt, ...) { char buf[1024]; va_list ap; va_start(ap, fmt); vsprintf(buf, fmt, ap); va_end(ap); \
-                fputs(buf, BJoystick::sLogFile); fflush(BJoystick::sLogFile); }
-        #define LOG_ERR(text...) LOG(text)
+#if DEBUG
+inline void
+LOG(const char *fmt, ...)
+{
+	char buf[1024];
+	va_list ap;
+	va_start(ap, fmt);
+	vsprintf(buf, fmt, ap);
+	va_end(ap);
+	fputs(buf, BJoystick::sLogFile); fflush(BJoystick::sLogFile);
+}
+#	define LOG_ERR(text...) LOG(text)
 FILE *BJoystick::sLogFile = NULL;
 #else
-        #define LOG(text...) 
-        #define LOG_ERR(text...) fprintf(stderr, text)
+#	define LOG(text...)
+#	define LOG_ERR(text...) fprintf(stderr, text)
 #endif
 
 #define CALLED() LOG("%s\n", __PRETTY_FUNCTION__)
@@ -40,11 +48,12 @@ FILE *BJoystick::sLogFile = NULL;
 #include "JoystickTweaker.h"
 
 BJoystick::BJoystick()
-	: _mBeBoxMode(false)
-	, _fDevices(new BList)
-	, m_info(new _joystick_info())
+	:
+	_mBeBoxMode(false),
+	_fDevices(new BList),
+	m_info(new _joystick_info())
 {
-#ifdef DEBUG
+#if DEBUG
 	sLogFile = fopen("/var/log/libdevice.log", "a");
 #endif
 	//ScanDevices();

src/kits/device/JoystickTweaker.cpp

@@ -18,7 +18,7 @@
 
 #include <UTF8.h>
 
-#ifdef DEBUG
+#if DEBUG
         inline void LOG(const char *fmt, ...) { char buf[1024]; va_list ap; va_start(ap, fmt); vsprintf(buf, fmt, ap); va_end(ap); \
                 fputs(buf, _BJoystickTweaker::sLogFile); fflush(_BJoystickTweaker::sLogFile); }
         #define LOG_ERR(text...) LOG(text)
@@ -33,7 +33,7 @@ FILE *_BJoystickTweaker::sLogFile = NULL;
 _BJoystickTweaker::_BJoystickTweaker()
 {
 	CALLED();
-#ifdef DEBUG
+#if DEBUG
 	sLogFile = fopen("/var/log/libdevice.log", "a");
 #endif
 }
@@ -42,7 +42,7 @@ _BJoystickTweaker::_BJoystickTweaker()
 _BJoystickTweaker::_BJoystickTweaker(BJoystick &stick)
 {
 	CALLED();
-#ifdef DEBUG
+#if DEBUG
 	sLogFile = fopen("/var/log/libdevice.log", "a");
 #endif
 
@@ -65,7 +65,7 @@ _BJoystickTweaker::save_config(const entry_ref *ref)
 
 status_t
 _BJoystickTweaker::scan_including_disabled(const char* rootPath, BList *list,
-						BEntry *rootEntry)
+	BEntry *rootEntry)
 {
 	BDirectory root;