$OpenBSD: patch-common_ECLogger_cpp,v 1.20 2015/11/02 11:06:34 robert Exp $
--- common/ECLogger.cpp.orig	Wed Aug  5 17:30:49 2015
+++ common/ECLogger.cpp	Thu Aug 20 13:20:50 2015
@@ -52,6 +52,10 @@
 #include "stringutil.h"
 #include "charset/localeutil.h"
 
+#ifdef __OpenBSD__
+#include <signal.h>
+#endif
+
 #include "config.h"
 #include <poll.h>
 #if HAVE_SYSLOG_H
@@ -88,18 +92,22 @@ static const char *const ll_names[] = {
 ECLogger::ECLogger(int max_ll) {
 	max_loglevel = max_ll;
 	// get system locale for time, NULL is returned if locale was not found.
+#ifndef __OpenBSD__
 	timelocale = createlocale(LC_TIME, "C");
 	datalocale = createUTF8Locale();
+#endif
 	prefix = LP_NONE;
 	m_ulRef = 1;
 }
 
 ECLogger::~ECLogger() {
+#ifndef __OpenBSD__
 	if (timelocale)
 		freelocale(timelocale);
 
 	if (datalocale)
 		freelocale(datalocale);
+#endif
 }
 
 void ECLogger::SetLoglevel(unsigned int max_ll) {
@@ -114,9 +122,11 @@ std::string ECLogger::MakeTimestamp() {
 
 	char buffer[_LOG_TSSIZE];
 
+#ifndef __OpenBSD__
 	if (timelocale)
 		strftime_l(buffer, sizeof buffer, "%c", &local, timelocale);
 	else
+#endif
 		strftime(buffer, sizeof buffer, "%c", &local);
 
 	return buffer;
@@ -175,7 +185,11 @@ int ECLogger::snprintf(char *str, size_t size, const c
 	int len = 0;
 
 	va_start(va, format);
+#ifndef __OpenBSD__
 	len = _vsnprintf_l(str, size, format, datalocale, va);
+#else
+	len = _vsnprintf_l(str, size, format, va);
+#endif
 	va_end(va);
 
 	return len;
@@ -397,7 +411,11 @@ void ECLogger_File::Log(unsigned int loglevel, const c
 
 void ECLogger_File::LogVA(unsigned int loglevel, const char *format, va_list& va) {
 	char msgbuffer[_LOG_BUFSIZE];
+#ifndef __OpenBSD__
 	_vsnprintf_l(msgbuffer, sizeof msgbuffer, format, datalocale, va);
+#else
+	_vsnprintf_l(msgbuffer, sizeof msgbuffer, format, va);
+#endif
 
 	Log(loglevel, std::string(msgbuffer));
 }
@@ -456,7 +474,11 @@ void ECLogger_Syslog::LogVA(unsigned int loglevel, con
 	vsyslog(levelmap[loglevel & EC_LOGLEVEL_MASK], format, va);
 #else
 	char msgbuffer[_LOG_BUFSIZE];
+#ifndef __OpenBSD__
+	_vsnprintf_l(msgbuffer, sizeof msgbuffer, format, va);
+#else
 	_vsnprintf_l(msgbuffer, sizeof msgbuffer, format, datalocale, va);
+#endif
 	syslog(levelmap[loglevel & EC_LOGLEVEL_MASK], "%s", msgbuffer);
 #endif
 }
@@ -541,7 +563,11 @@ void ECLogger_Tee::LogVA(unsigned int loglevel, const 
 	LoggerList::iterator iLogger;
 
 	char msgbuffer[_LOG_BUFSIZE];
+#ifndef __OpenBSD__
 	_vsnprintf_l(msgbuffer, sizeof msgbuffer, format, datalocale, va);
+#else
+	_vsnprintf_l(msgbuffer, sizeof msgbuffer, format, va);
+#endif
 
 	for (iLogger = m_loggers.begin(); iLogger != m_loggers.end(); ++iLogger)
 		(*iLogger)->Log(loglevel, std::string(msgbuffer));
@@ -588,7 +614,7 @@ void ECLogger_Pipe::Log(unsigned int loglevel, const s
 	off += 1;
 
 	if (prefix == LP_TID)
-	len = snprintf(msgbuffer + off, sizeof msgbuffer - off, "[0x%08x] ", (unsigned int)pthread_self());
+	len = snprintf(msgbuffer + off, sizeof msgbuffer - off, "[0x%08x] ", (uintptr_t)pthread_self());
 	else if (prefix == LP_PID)
 		len = snprintf(msgbuffer + off, sizeof msgbuffer - off, "[%5d] ", getpid());
 
@@ -632,7 +658,7 @@ void ECLogger_Pipe::LogVA(unsigned int loglevel, const
 	off += 1;
 
 	if (prefix == LP_TID)
-	len = snprintf(msgbuffer + off, sizeof msgbuffer - off, "[0x%08x] ", (unsigned int)pthread_self());
+	len = snprintf(msgbuffer + off, sizeof msgbuffer - off, "[0x%08x] ", (uintptr_t)pthread_self());
 	else if (prefix == LP_PID)
 		len = snprintf(msgbuffer + off, sizeof msgbuffer - off, "[%5d] ", getpid());
 
@@ -642,7 +668,11 @@ void ECLogger_Pipe::LogVA(unsigned int loglevel, const
 		off += len;
 
 	// return value is what WOULD have been written if enough space were available in the buffer
+#ifndef __OpenBSD__
 	len = _vsnprintf_l(msgbuffer + off, sizeof msgbuffer - off - 1, format, datalocale, va);
+#else
+	len = _vsnprintf_l(msgbuffer + off, sizeof msgbuffer - off - 1, format, va);
+#endif
 	// -1 can be returned on formatting error (eg. %ls in C locale)
 	if (len < 0)
 		len = 0;
@@ -722,9 +752,13 @@ namespace PrivatePipe {
 		int l;
 		bool bNPTL = true;
 
+#if defined(__linux__)
 		confstr(_CS_GNU_LIBPTHREAD_VERSION, buffer, sizeof(buffer));
 		if (strncmp(buffer, "linuxthreads", strlen("linuxthreads")) == 0)
 			bNPTL = false;
+#elif defined(__OpenBSD__)
+		bNPTL = true;
+#endif
 
 		m_lpConfig = lpConfig;
 		m_lpFileLogger = lpFileLogger;
