hrev43635 adds 2 changesets to branch 'master'
old head: 91d012366cb63eda49267b48898336e61413ee84
new head: ecea46bcfdf52fb734227f2aa162eeeb303d4285
----------------------------------------------------------------------------
423affc: Fix warnings for DEBUG build. Build with tracing still broken.
This is a modified version of a patch in #8252 by Urias McCullough.
ecea46b: Unconditionally add debug.c. Fixes DEBUG build.
The file is guarded with DEBUG so this doesn't change anything for
non-debug builds. Inspired by patch in #8252 by Urias McCullough.
[ Michael Lotz <mmlr@xxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 3 insertions(+), 2 deletions(-)
.../media-add-ons/opensound/OpenSoundAddOn.cpp | 2 +-
.../media-add-ons/opensound/OpenSoundNode.cpp | 2 +-
src/bin/ctags/Jamfile | 1 +
############################################################################
Commit: 423affc20971403399ea837db07ba292cb200fed
URL: http://cgit.haiku-os.org/haiku/commit/?id=423affc
Author: Michael Lotz <mmlr@xxxxxxxx>
Date: Sat Jan 7 01:18:44 2012 UTC
Ticket: https://dev.haiku-os.org/ticket/8252
Fix warnings for DEBUG build. Build with tracing still broken.
This is a modified version of a patch in #8252 by Urias McCullough.
----------------------------------------------------------------------------
diff --git a/src/add-ons/media/media-add-ons/opensound/OpenSoundAddOn.cpp
b/src/add-ons/media/media-add-ons/opensound/OpenSoundAddOn.cpp
index a8c63f3..4c2cb5b 100644
--- a/src/add-ons/media/media-add-ons/opensound/OpenSoundAddOn.cpp
+++ b/src/add-ons/media/media-add-ons/opensound/OpenSoundAddOn.cpp
@@ -90,7 +90,7 @@ status_t OpenSoundAddOn::InitCheck(
int32 OpenSoundAddOn::CountFlavors()
{
CALLED();
- PRINT(("%d flavours\n", fDevices.CountItems()));
+ PRINT(("%" B_PRId32 " flavours\n", fDevices.CountItems()));
return fDevices.CountItems();
}
diff --git a/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
b/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
index d8f7693..c83860a 100644
--- a/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
+++ b/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
@@ -559,7 +559,7 @@ OpenSoundNode::NodeRegistered()
SetParameterWeb(fWeb);
// apply configuration
-#ifdef PRINTING
+#ifdef TRACE_OSS_NODE
bigtime_t start = system_time();
#endif
############################################################################
Revision: hrev43635
Commit: ecea46bcfdf52fb734227f2aa162eeeb303d4285
URL: http://cgit.haiku-os.org/haiku/commit/?id=ecea46b
Author: Michael Lotz <mmlr@xxxxxxxx>
Date: Sat Jan 7 01:27:16 2012 UTC
Ticket: https://dev.haiku-os.org/ticket/8252
Unconditionally add debug.c. Fixes DEBUG build.
The file is guarded with DEBUG so this doesn't change anything for
non-debug builds. Inspired by patch in #8252 by Urias McCullough.
----------------------------------------------------------------------------
diff --git a/src/bin/ctags/Jamfile b/src/bin/ctags/Jamfile
index 3b789b3..650d9da 100644
--- a/src/bin/ctags/Jamfile
+++ b/src/bin/ctags/Jamfile
@@ -15,6 +15,7 @@ BinCommand ctags :
beta.c
c.c
cobol.c
+ debug.c
eiffel.c
entry.c
erlang.c
