diff mbox

libosmocore[master]: Fix build for OSX

Message ID 20160519041953.3FE44659F@lists.osmocom.org
State New
Headers show

Commit Message

gerrit-no-reply@lists.osmocom.org May 19, 2016, 4:19 a.m. UTC 
Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/74

to look at the new patch set (#4).

Fix build for OSX

Change-Id: I580a500edcf4812e570be586890abef746083a8c
---
M include/osmocom/core/endian.h
M src/stats.c
2 files changed, 24 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/74/74/4
diff mbox

Patch

diff --git a/include/osmocom/core/endian.h b/include/osmocom/core/endian.h
index c890fd7..02c6406 100644
--- a/include/osmocom/core/endian.h
+++ b/include/osmocom/core/endian.h
@@ -23,6 +23,17 @@ 
         #else
                 #error "Unknown endian"
         #endif
+#elif defined(__APPLE__)
+#include <machine/endian.h>
+	#if defined(__DARWIN_LITTLE_ENDIAN)
+		#define OSMO_IS_LITTLE_ENDIAN		1
+		#define OSMO_IS_BIG_ENDIAN		0
+	#elif define(__DARWIN_BIG_ENDIAN)
+		#define OSMO_IS_LITTLE_ENDIAN		0
+		#define OSMO_IS_BIG_ENDIAN		1
+	#else
+		#error "Unknown endian"
+	#endif
 #else
 #include <endian.h>
         #if __BYTE_ORDER == __LITTLE_ENDIAN
diff --git a/src/stats.c b/src/stats.c
index 73b2703..5f1d028 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -301,6 +301,14 @@ 
 	if (sock == -1)
 		return -errno;
 
+#if defined(__APPLE__) && !defined(MSG_NOSIGNAL)
+	{
+		static int val = 1;
+
+		rc = setsockopt(sock, SOL_SOCKET, SO_NOSIGPIPE, (void*)&val, sizeof(val));
+		goto failed;
+	}
+#endif
 	if (srep->bind_addr_len > 0) {
 		rc = bind(sock, &srep->bind_addr, srep->bind_addr_len);
 		if (rc == -1)
@@ -345,7 +353,11 @@ 
 {
 	int rc;
 
-	rc = sendto(srep->fd, data, data_len, MSG_NOSIGNAL | MSG_DONTWAIT,
+	rc = sendto(srep->fd, data, data_len,
+#ifdef MSG_NOSIGNAL
+		MSG_NOSIGNAL |
+#endif
+		MSG_DONTWAIT,
 		&srep->dest_addr, srep->dest_addr_len);
 
 	if (rc == -1)