From 5cb0a3cb724e6b41d555ea54e13b0dd52d772a87 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 15 Apr 2009 16:48:06 +0200 Subject: [PATCH] debugger: put the address of the loaded helpers into the debugger log --- share/qtcreator/gdbmacros/gdbmacros.cpp | 11 ++++++----- src/plugins/debugger/gdbengine.cpp | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp index e688fa3fa28..b452b0ce811 100644 --- a/share/qtcreator/gdbmacros/gdbmacros.cpp +++ b/share/qtcreator/gdbmacros/gdbmacros.cpp @@ -202,11 +202,12 @@ QT_END_NAMESPACE #endif // PRIVATE_OBJECT_ALLOWED -// this can be mangled typenames of nested templates, each char-by-char -// comma-separated integer list -static char qDumpInBuffer[10000]; -static char qDumpOutBuffer[100000]; -//static char qDumpSize[20]; +// This can be mangled typenames of nested templates, each char-by-char +// comma-separated integer list... +char qDumpInBuffer[10000]; + +// The output buffer. +char qDumpOutBuffer[100000]; namespace { diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdbengine.cpp index 31718958102..c2d2c4b4c3f 100644 --- a/src/plugins/debugger/gdbengine.cpp +++ b/src/plugins/debugger/gdbengine.cpp @@ -4151,10 +4151,10 @@ void GdbEngine::tryLoadDebuggingHelpers() QString flag = QString::number(RTLD_NOW); sendCommand("sharedlibrary libc"); // for malloc sendCommand("sharedlibrary libdl"); // for dlopen - sendCommand("call (void)dlopen(\"" + lib + "\", " + flag + ")", + sendCommand("call (void*)dlopen(\"" + lib + "\", " + flag + ")", WatchDebuggingHelperSetup); // some older systems like CentOS 4.6 prefer this: - sendCommand("call (void)__dlopen(\"" + lib + "\", " + flag + ")", + sendCommand("call (void*)__dlopen(\"" + lib + "\", " + flag + ")", WatchDebuggingHelperSetup); sendCommand("sharedlibrary " + dotEscape(lib)); #endif