[haiku-commits] haiku: hrev48188 - in src: add-ons/kernel/bus_managers/acpi/acpica/components/utilities preferences/touchpad apps/serialconnect/libvterm/src apps/icon-o-matic/generic/selection add-ons/kernel/drivers/disk/virtual/nbd
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 31 Oct 2014 16:49:49 +0100 (CET)
hrev48188 adds 1 changeset to branch 'master'
old head: 960598d4c3fba67565d4e5b3e778ba786f3bb947
new head: f3814567402774e6d92af11d4e40bcbc3b1cb4dd
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=f381456+%5E960598d
----------------------------------------------------------------------------
f381456: Fix errors when building with DEBUG=2
Fixes #8306. Please define DEBUG in UserBuildConfig or Jamfiles if
needed.
[ Adrien Destugues <pulkomandy@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev48188
Commit: f3814567402774e6d92af11d4e40bcbc3b1cb4dd
URL: http://cgit.haiku-os.org/haiku/commit/?id=f381456
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Fri Oct 31 15:45:31 2014 UTC
Ticket: https://dev.haiku-os.org/ticket/8306
----------------------------------------------------------------------------
12 files changed, 7 insertions(+), 17 deletions(-)
src/add-ons/accelerants/matrox/be_driver_proto.h | 2 --
src/add-ons/accelerants/neomagic/be_driver_proto.h | 2 --
src/add-ons/accelerants/nvidia/be_driver_proto.h | 2 --
.../bus_managers/acpi/acpica/components/utilities/utdelete.c | 4 ++--
.../kernel/bus_managers/acpi/acpica/components/utilities/utinit.c | 2 +-
src/add-ons/kernel/drivers/disk/virtual/nbd/nbd.c | 2 --
src/add-ons/print/drivers/pdf/source/Link.cpp | 1 -
src/apps/icon-o-matic/generic/selection/Selection.cpp | 2 --
src/apps/serialconnect/libvterm/src/encoding.c | 1 +
src/apps/serialconnect/libvterm/src/state.c | 4 +++-
src/preferences/touchpad/TouchpadPref.h | 1 -
src/preferences/touchpad/TouchpadPrefView.h | 1 -
----------------------------------------------------------------------------
diff --git a/src/add-ons/accelerants/matrox/be_driver_proto.h
b/src/add-ons/accelerants/matrox/be_driver_proto.h
index 42e2129..ba3c2c9 100644
--- 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
index efd6c84..d6d50f7 100644
--- 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
index 6080569..3f95c4c 100644
--- 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
index d42d8a7..31675fa 100644
---
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
index 8df0277..0759ef3 100644
--- 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
index 2106835..48a0ab0 100644
--- 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
index 083eadb..ea24d3b 100644
--- 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
index 03f9137..d1dc1fa 100644
--- 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
index 4b7453f..977cb20 100644
--- 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
index 8878515..c5a51e0 100644
--- 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
index 1bfe452..94aab9c 100644
--- 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
index 8b861be..bd4dd5d 100644
--- 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
Other related posts:
