Fix errors when building with DEBUG=2

Fixes #8306. Please define DEBUG in UserBuildConfig or Jamfiles if needed.
haiku · Oct 31, 2014 · f381456 · f381456
1 parent 960598d
commit f381456
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 17 deletions.
diff --git a/src/add-ons/accelerants/matrox/be_driver_proto.h b/src/add-ons/accelerants/matrox/be_driver_proto.h
@@ -9,8 +9,6 @@
 #include <Accelerant.h>
 #include "video_overlay.h"
 
-#define DEBUG 1
-
 status_t INIT_ACCELERANT(int fd);
 ssize_t ACCELERANT_CLONE_INFO_SIZE(void);
 void GET_ACCELERANT_CLONE_INFO(void *data);

diff --git a/src/add-ons/accelerants/neomagic/be_driver_proto.h b/src/add-ons/accelerants/neomagic/be_driver_proto.h
@@ -9,8 +9,6 @@
 #include <Accelerant.h>
 #include "video_overlay.h"
 
-#define DEBUG 1
-
 status_t INIT_ACCELERANT(int fd);
 ssize_t ACCELERANT_CLONE_INFO_SIZE(void);
 void GET_ACCELERANT_CLONE_INFO(void *data);

diff --git a/src/add-ons/accelerants/nvidia/be_driver_proto.h b/src/add-ons/accelerants/nvidia/be_driver_proto.h
@@ -11,8 +11,6 @@
 #include <Accelerant.h>
 #include <video_overlay.h>
 
-#define DEBUG 1
-
 status_t INIT_ACCELERANT(int fd);
 ssize_t ACCELERANT_CLONE_INFO_SIZE(void);
 void GET_ACCELERANT_CLONE_INFO(void *data);

diff --git a/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utdelete.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utdelete.c
@@ -259,7 +259,7 @@ AcpiUtDeleteInternalObj (
             /* Global Lock has extra semaphore */
 
             (void) AcpiOsDeleteSemaphore (AcpiGbl_GlobalLockSemaphore);
-            AcpiGbl_GlobalLockSemaphore = NULL;
+            AcpiGbl_GlobalLockSemaphore = 0;
 
             AcpiOsDeleteMutex (Object->Mutex.OsMutex);
             AcpiGbl_GlobalLockMutex = NULL;
@@ -278,7 +278,7 @@ AcpiUtDeleteInternalObj (
             Object, Object->Event.OsSemaphore));
 
         (void) AcpiOsDeleteSemaphore (Object->Event.OsSemaphore);
-        Object->Event.OsSemaphore = NULL;
+        Object->Event.OsSemaphore = 0;
         break;
 
     case ACPI_TYPE_METHOD:

diff --git a/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utinit.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utinit.c
@@ -283,7 +283,7 @@ AcpiUtInitGlobals (
 
     /* Global Lock support */
 
-    AcpiGbl_GlobalLockSemaphore         = NULL;
+    AcpiGbl_GlobalLockSemaphore         = 0;
     AcpiGbl_GlobalLockMutex             = NULL;
     AcpiGbl_GlobalLockAcquired          = FALSE;
     AcpiGbl_GlobalLockHandle            = 0;

diff --git a/src/add-ons/kernel/drivers/disk/virtual/nbd/nbd.c b/src/add-ons/kernel/drivers/disk/virtual/nbd/nbd.c
@@ -53,8 +53,6 @@
 #define mutex_unlock UNLOCK
 #endif
 
-#define DEBUG 1
-
 #include "nbd.h"
 
 #define DRV "nbd"

diff --git a/src/add-ons/print/drivers/pdf/source/Link.cpp b/src/add-ons/print/drivers/pdf/source/Link.cpp
@@ -27,7 +27,6 @@ THE SOFTWARE.
 
 */
 
-#define DEBUG 1
 #include <Debug.h>
 #include <ctype.h>
 #include "Link.h"

diff --git a/src/apps/icon-o-matic/generic/selection/Selection.cpp b/src/apps/icon-o-matic/generic/selection/Selection.cpp
@@ -14,8 +14,6 @@
 
 #include "Selectable.h"
 
-#define DEBUG 1
-
 // constructor
 Selection::Selection()
 	: fSelected(20)

diff --git a/src/apps/serialconnect/libvterm/src/encoding.c b/src/apps/serialconnect/libvterm/src/encoding.c
@@ -3,6 +3,7 @@
 #define UNICODE_INVALID 0xFFFD
 
 #if defined(DEBUG) && DEBUG > 1
+# include <stdio.h>
 # define DEBUG_PRINT_UTF8
 #endif
 

diff --git a/src/apps/serialconnect/libvterm/src/state.c b/src/apps/serialconnect/libvterm/src/state.c
@@ -228,6 +228,7 @@ static int on_text(const char bytes[], size_t len, void *user)
   if(vterm_unicode_is_combining(codepoints[i])) {
     /* See if the cursor has moved since */
     if(state->pos.row == state->combine_pos.row && state->pos.col == state->combine_pos.col + state->combine_width) {
+      unsigned saved_i = 0;
 #ifdef DEBUG_GLYPH_COMBINE
       int printpos;
       printf("DEBUG: COMBINING SPLIT GLYPH of chars {");
@@ -237,7 +238,6 @@ static int on_text(const char bytes[], size_t len, void *user)
 #endif
 
       /* Find where we need to append these combining chars */
-      unsigned saved_i = 0;
       while(state->combine_chars[saved_i])
         saved_i++;
 
@@ -287,11 +287,13 @@ static int on_text(const char bytes[], size_t len, void *user)
     i--;
 
 #ifdef DEBUG_GLYPH_COMBINE
+	{
     int printpos;
     printf("DEBUG: COMBINED GLYPH of %d chars {", glyph_ends - glyph_starts);
     for(printpos = 0; printpos < glyph_ends - glyph_starts; printpos++)
       printf("U+%04x ", chars[printpos]);
     printf("}, onscreen width %d\n", width);
+	}
 #endif
 
     if(state->at_phantom || state->pos.col + width > THISROWWIDTH(state)) {

diff --git a/src/preferences/touchpad/TouchpadPref.h b/src/preferences/touchpad/TouchpadPref.h
@@ -9,7 +9,6 @@
 #define TOUCHPAD_PREF_H
 
 
-#define DEBUG 1
 #include <Debug.h>
 
 #include "touchpad_settings.h"

diff --git a/src/preferences/touchpad/TouchpadPrefView.h b/src/preferences/touchpad/TouchpadPrefView.h
@@ -21,7 +21,6 @@
 #include "TouchpadPref.h"
 #include "touchpad_settings.h"
 
-#define DEBUG 1
 #include <Debug.h>
 
 #if DEBUG