Merge branch 'egil/darwin-fixes'

* egil/darwin-fixes:
  erl_interface: Avoid redefinition of ALIGNBYTES
  erts: Fix '#ifdef' for unused static functions
  erts: Remove forgotten vxworks includes
  hipe: Cast offsetof to int in hipe_arch_print_pcb

3 files changed, 14 insertions, 6 deletions

diff --git a/erts/emulator/hipe/hipe_x86.c b/erts/emulator/hipe/hipe_x86.c
index 24d232c968..4281730ae2 100644
--- a/erts/emulator/hipe/hipe_x86.c
+++ b/erts/emulator/hipe/hipe_x86.c
@@ -265,7 +265,7 @@ void *hipe_make_native_stub(void *beamAddress, unsigned int beamArity)
 void hipe_arch_print_pcb(struct hipe_process_state *p)
 {
 #define U(n,x) \
-    printf(" % 4d | %s | 0x%08x |            |\r\n", offsetof(struct hipe_process_state,x), n, (unsigned)p->x)
+    printf(" % 4d | %s | 0x%08x |            |\r\n", (int)offsetof(struct hipe_process_state,x), n, (unsigned)p->x)
     U("ncsp       ", ncsp);
     U("narity     ", narity);
 #undef U
diff --git a/erts/lib_src/common/erl_misc_utils.c b/erts/lib_src/common/erl_misc_utils.c
index 3b123063fa..1b49f69581 100644
--- a/erts/lib_src/common/erl_misc_utils.c
+++ b/erts/lib_src/common/erl_misc_utils.c
@@ -28,8 +28,6 @@
 #include "erl_misc_utils.h"
 
 #if defined(__WIN32__)
-#elif defined(VXWORKS)
-#  include <selectLib.h>
 #else /* UNIX */
 #  include <stdio.h>
 #  include <sys/types.h>
@@ -124,6 +122,12 @@
 #include <sys/sysctl.h>
 #endif
 
+/* Simplify include for static functions */
+
+#if defined(__linux__) || defined(HAVE_KSTAT) || defined(__WIN32__) || defined(__FreeBSD__)
+#  define ERTS_CPU_TOPOLOGY_ENABLED (1)
+#endif
+
 static int read_topology(erts_cpu_info_t *cpuinfo);
 
 #if defined(ERTS_HAVE_MISC_UTIL_AFFINITY_MASK__)
@@ -669,6 +673,7 @@ erts_unbind_from_cpu_str(char *str)
 }
 
 
+#if defined(ERTS_CPU_TOPOLOGY_ENABLED)
 static int
 pn_cmp(const void *vx, const void *vy)
 {
@@ -759,6 +764,7 @@ adjust_processor_nodes(erts_cpu_info_t *cpuinfo, int no_nodes)
 	}
     }
 }
+#endif
 
 
 #ifdef __linux__
diff --git a/lib/erl_interface/src/connect/ei_resolve.c b/lib/erl_interface/src/connect/ei_resolve.c
index ba8f8fbce3..79d259b92d 100644
--- a/lib/erl_interface/src/connect/ei_resolve.c
+++ b/lib/erl_interface/src/connect/ei_resolve.c
@@ -186,11 +186,11 @@ static int verify_dns_configuration(void)
  * advance:  increment buf by n bytes, reduce len by same amount .
  */
 #if defined SIZEOF_VOID_P
-#define ALIGNBYTES (SIZEOF_VOID_P - 1)
+#define EI_ALIGNBYTES (SIZEOF_VOID_P - 1)
 #else
-#define ALIGNBYTES (sizeof(void*) - 1)
+#define EI_ALIGNBYTES (sizeof(void*) - 1)
 #endif
-#define align_buf(buf,len) for (;(((unsigned)buf) & ALIGNBYTES); (buf)++, len--)
+#define align_buf(buf,len) for (;(((unsigned)buf) & EI_ALIGNBYTES); (buf)++, len--)
 #define advance_buf(buf,len,n) ((buf)+=(n),(len)-=(n))
 
 /* "and now the tricky part..." */
@@ -282,6 +282,8 @@ static int copy_hostent(struct hostent *dest, const struct hostent *src, char *b
   return 0;
 }
 
+#undef EI_ALIGNBYTES
+
 /* This function is a pseudo-reentrant version of gethostbyname(). It
  * uses locks to serialize the call to the regular (non-reentrant)
  * gethostbyname() and then copies the data into the user-provided