From 95a317d43f0d101013593fd2c1af00e7865f98cd Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 15 Jan 2009 16:40:41 +0000 Subject: added a workaround for strerror_r problem moved initLibGcrypt to right position (needs to be called before any other libgcrypt call) --- src/log.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/log.cpp') diff --git a/src/log.cpp b/src/log.cpp index 3fb569c..2fa603e 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -57,9 +57,16 @@ std::ostream& operator<<(std::ostream& stream, LogErrno const& value) { char buf[STERROR_TEXT_MAX]; buf[0] = 0; -// TODO: fix to use XSI Compliant strerror_r - char* tmp = strerror_r(value.err_, buf, STERROR_TEXT_MAX); - return stream << tmp; + char* errStr; +// this really sucks, g++ seems to unconditionally define _GNU_SOURCE +// and undefining it breaks the build... +#ifdef _GNU_SOURCE + errStr = strerror_r(value.err_, buf, STERROR_TEXT_MAX); +#else + strerror_r(value.err_, buf, STERROR_TEXT_MAX); + errStr = buf; +#endif + return stream << errStr; } LogStringBuilder::LogStringBuilder(LogStringBuilder const& src) : log(src.log), prio(src.prio) -- cgit v1.2.3