hrev46537 adds 2 changesets to branch 'master' old head: df612ac9b3f05f1f2ddfd5dfd4891f956759e3db new head: 2d768aeb6ff1f4ca27d5b861f4f6b7c5fcee1f78 overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=2d768ae+%5Edf612ac ---------------------------------------------------------------------------- 4b62c6b: libmedia: Fix x86-64 debug build. 2d768ae: libnetwork: Fix 64-bit debug build. [ Rene Gollent <rene@xxxxxxxxxxx> ] ---------------------------------------------------------------------------- 2 files changed, 3 insertions(+), 3 deletions(-) headers/private/media/debug.h | 4 ++-- src/kits/network/libnetapi/UrlRequest.cpp | 2 +- ############################################################################ Commit: 4b62c6b0bccc5a051b35a9688b5111225450825d URL: http://cgit.haiku-os.org/haiku/commit/?id=4b62c6b Author: Rene Gollent <rene@xxxxxxxxxxx> Date: Fri Dec 13 22:53:12 2013 UTC libmedia: Fix x86-64 debug build. ---------------------------------------------------------------------------- diff --git a/headers/private/media/debug.h b/headers/private/media/debug.h index af1e4c8..b81dac8 100644 --- a/headers/private/media/debug.h +++ b/headers/private/media/debug.h @@ -18,8 +18,8 @@ inline void PRINT(int level, const char *fmt, ...) { va_list ap; if (level > DEBUG) return; va_start(ap, fmt); vprintf(fmt, ap); va_end(ap); } #define PRINT_FORMAT(_text, _fmt) do { char _buf[300]; string_for_format((_fmt), _buf, sizeof(_buf)); printf("%s %s\n", (_text), (_buf)); } while (0) - #define PRINT_INPUT(_text, _in) do { char _buf[300]; string_for_format((_in).format, _buf, sizeof(_buf)); printf("%s node(node %ld, port %ld); source(port %ld, id %ld); dest(port %ld, id %ld); fmt(%s); name(%s)\n", (_text), (_in).node.node, (_in).node.port, (_in).source.port, (_in).source.id, (_in).destination.port, (_in).destination.id, _buf, (_in).name); } while (0) - #define PRINT_OUTPUT(_text, _out) do { char _buf[300]; string_for_format((_out).format, _buf, sizeof(_buf)); printf("%s node(node %ld, port %ld); source(port %ld, id %ld); dest(port %ld, id %ld); fmt(%s); name(%s)\n", (_text), (_out).node.node, (_out).node.port, (_out).source.port, (_out).source.id, (_out).destination.port, (_out).destination.id, _buf, (_out).name); } while (0) + #define PRINT_INPUT(_text, _in) do { char _buf[300]; string_for_format((_in).format, _buf, sizeof(_buf)); printf("%s node(node %" B_PRId32 ", port %" B_PRId32 "); source(port %" B_PRId32 ", id %" B_PRId32 "); dest(port %" B_PRId32 ", id %" B_PRId32 "); fmt(%s); name(%s)\n", (_text), (_in).node.node, (_in).node.port, (_in).source.port, (_in).source.id, (_in).destination.port, (_in).destination.id, _buf, (_in).name); } while (0) + #define PRINT_OUTPUT(_text, _out) do { char _buf[300]; string_for_format((_out).format, _buf, sizeof(_buf)); printf("%s node(node %" B_PRId32 ", port %" B_PRId32 "); source(port %" B_PRId32 ", id %" B_PRId32 "); dest(port %" B_PRId32 ", id %" B_PRId32 "); fmt(%s); name(%s)\n", (_text), (_out).node.node, (_out).node.port, (_out).source.port, (_out).source.id, (_out).destination.port, (_out).destination.id, _buf, (_out).name); } while (0) #if DEBUG >= 2 #define BROKEN() printf("BROKEN %s\n",__PRETTY_FUNCTION__) ############################################################################ Revision: hrev46537 Commit: 2d768aeb6ff1f4ca27d5b861f4f6b7c5fcee1f78 URL: http://cgit.haiku-os.org/haiku/commit/?id=2d768ae Author: Rene Gollent <rene@xxxxxxxxxxx> Date: Fri Dec 13 22:54:07 2013 UTC libnetwork: Fix 64-bit debug build. ---------------------------------------------------------------------------- diff --git a/src/kits/network/libnetapi/UrlRequest.cpp b/src/kits/network/libnetapi/UrlRequest.cpp index e14696e..351aa16 100644 --- a/src/kits/network/libnetapi/UrlRequest.cpp +++ b/src/kits/network/libnetapi/UrlRequest.cpp @@ -70,7 +70,7 @@ BUrlRequest::Run() status_t launchErr = resume_thread(fThreadId); if (launchErr < B_OK) { - PRINT(("BUrlRequest::Run() : Failed to resume thread %ld\n", + PRINT(("BUrlRequest::Run() : Failed to resume thread %" B_PRId32 "\n", fThreadId)); return launchErr; }