Build fixes for OpenBSD.

ChangeLog.txt

@@ -1,4 +1,5 @@
 - Fix incorrect bridge notification on initial connection. Closes #467096.
+- Build fixes for OpenBSD.
 
 1.4.2 - 20150507
 ================

config.h

@@ -24,3 +24,6 @@
 #define uthash_malloc(sz) _mosquitto_malloc(sz)
 #define uthash_free(ptr,sz) _mosquitto_free(ptr)
 
+#ifndef EPROTO
+#  define EPROTO ECONNABORTED
+#endif

config.mk

@@ -115,7 +115,7 @@ LIB_LDFLAGS:=${LDFLAGS}
 BROKER_CFLAGS:=${LIB_CFLAGS} ${CPPFLAGS} -DVERSION="\"${VERSION}\"" -DTIMESTAMP="\"${TIMESTAMP}\"" -DWITH_BROKER
 CLIENT_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I../lib -DVERSION="\"${VERSION}\""
 
-ifeq ($(UNAME),FreeBSD)
+ifneq ($(or $(find $(UNAME),FreeBSD), $(find $(UNAME),OpenBSD)),)
 	BROKER_LIBS:=-lm
 else
 	BROKER_LIBS:=-ldl -lm

lib/memory_mosq.h

@@ -20,7 +20,7 @@ Contributors:
 #include <stdio.h>
 #include <sys/types.h>
 
-#if defined(WITH_MEMORY_TRACKING) && defined(WITH_BROKER) && !defined(WIN32) && !defined(__SYMBIAN32__) && !defined(__ANDROID__) && !defined(__UCLIBC__)
+#if defined(WITH_MEMORY_TRACKING) && defined(WITH_BROKER) && !defined(WIN32) && !defined(__SYMBIAN32__) && !defined(__ANDROID__) && !defined(__UCLIBC__) && !defined(__OpenBSD__)
 #define REAL_WITH_MEMORY_TRACKING
 #endif
 

lib/mosquitto.c

@@ -44,6 +44,8 @@ typedef int ssize_t;
 #include <util_mosq.h>
 #include <will_mosq.h>
 
+#include "config.h"
+
 #if !defined(WIN32) && !defined(__SYMBIAN32__)
 #define HAVE_PSELECT
 #endif

lib/net_mosq.c

@@ -81,6 +81,8 @@ Contributors:
 #include <time_mosq.h>
 #include <util_mosq.h>
 
+#include "config.h"
+
 #ifdef WITH_TLS
 int tls_ex_index_mosq = -1;
 #endif

lib/tls_mosq.c

@@ -21,6 +21,7 @@ Contributors:
 #  include <ws2tcpip.h>
 #else
 #  include <arpa/inet.h>
+#  include <sys/socket.h>
 #endif
 
 #include <string.h>