Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: misc cleanups

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-04-30 00:30:19 +00:00
parent 795dbcc1fd
commit 344cd812dc
3 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ConfigureChecks.cmake
View file

@ -80,7 +80,7 @@ check_symbol_exists(posix_madvise "sys/mman.h" HAVE_MADVISE)
check_symbol_exists(getgrouplist "unistd.h;grp.h" HAVE_GETGROUPLIST)# kdecore/fakes.c
check_function_exists(backtrace HAVE_BACKTRACE) # kdecore, kio
check_function_exists(fdatasync HAVE_FDATASYNC) # kdecore, kate
check_function_exists(fdatasync HAVE_FDATASYNC) # kdecore, kate
check_function_exists(mmap HAVE_MMAP) # kdecore
check_function_exists(sendfile HAVE_SENDFILE) # kioslave

4
kdecore/io/kdebug.cpp
View file

@ -696,14 +696,14 @@ static QString maybeDemangledName(char *name)
}
#endif
QString kRealBacktrace(int levels)
QString kBacktrace(int levels)
{
QString s;
#ifdef HAVE_BACKTRACE
void* trace[256];
int n = backtrace(trace, 256);
if (!n)
return s;
return s;
char** strings = backtrace_symbols (trace, n);
if ( levels != -1 )

11
kdecore/io/kdebug.h
View file

@ -72,13 +72,6 @@ KDECORE_EXPORT QDebug kDebugStream(QtMsgType level, int area, const char *file =
*/
KDECORE_EXPORT QDebug kDebugDevNull();
/**
* @internal
* The actual backtrace.
*/
KDECORE_EXPORT QString kRealBacktrace(int);
/**
* \relates KGlobal
* Returns a backtrace.
@ -89,9 +82,9 @@ KDECORE_EXPORT QString kRealBacktrace(int);
* @return a backtrace
*/
#if !defined(KDE_NO_DEBUG_OUTPUT)
inline QString kBacktrace(int levels=-1) { return kRealBacktrace(levels); }
KDECORE_EXPORT QString kBacktrace(int levels=-1);
#else
static inline QString kBacktrace(int=-1) { return QString(); }
inline QString kBacktrace(int=-1) { return QString(); };
#endif
/**