r15398 by craig - #9311: Avoid building this testing backtrace function on OpenBSD
scribus-commit
scribus-commit at lists.scribus.net
Wed Aug 4 22:29:23 CEST 2010
Author: craig
Date: Wed Aug 4 20:29:22 2010
New Revision: 15398
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15398
Log:
#9311: Avoid building this testing backtrace function on OpenBSD
Modified:
branches/Version135/Scribus/scribus/util.cpp
branches/Version135/Scribus/scribus/util.h
Modified: branches/Version135/Scribus/scribus/util.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15398&path=/branches/Version135/Scribus/scribus/util.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/util.cpp (original)
+++ branches/Version135/Scribus/scribus/util.cpp Wed Aug 4 20:29:22 2010
@@ -927,7 +927,6 @@
}
}
-#if !defined(_WIN32) && !defined(Q_OS_MAC)
/**
* Print a backtrace
* Please never commit code that uses it.
@@ -935,6 +934,7 @@
*/
void printBacktrace ( int nFrames )
{
+#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_OPENBSD)
void ** trace = new void*[nFrames + 1];
char **messages = ( char ** ) NULL;
int i, trace_size = 0;
@@ -969,6 +969,6 @@
free ( messages );
}
delete[] trace;
-}
#endif
-
+}
+
Modified: branches/Version135/Scribus/scribus/util.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15398&path=/branches/Version135/Scribus/scribus/util.h
==============================================================================
--- branches/Version135/Scribus/scribus/util.h (original)
+++ branches/Version135/Scribus/scribus/util.h Wed Aug 4 20:29:22 2010
@@ -143,7 +143,6 @@
QString SCRIBUS_API getDashString(int dashtype, double linewidth);
void SCRIBUS_API getDashArray(int dashtype, double linewidth, QVector<double> &m_array);
void SCRIBUS_API getDashArray(int dashtype, double linewidth, QVector<float> &m_array);
-
void SCRIBUS_API printBacktrace(int nFrames);
#endif
More information about the scribus-commit
mailing list