net: handle macro redefinitions for OS X

undefine macros and reorder header includes to get rid of system
defined macros on OS X

fixes #1165

cpu/native/include/clang_compat.h

@@ -0,0 +1,20 @@
+/*
+ * clang_compat.h Undefines macros of clang on OSX to use RIOT's macros
+ *
+ * Copyright (C) 2014 Thomas Eichinger <thomas.eichinger@fu-berlin.de>
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser General
+ * Public License. See the file LICENSE in the top level directory for more
+ * details.
+ */
+
+#ifndef __CLANG_COMPAT_H
+
+#undef HTONS
+#undef HTONL
+#undef HTONLL
+#undef NTOHS
+#undef NTOHL
+#undef NTOHLL
+
+#endif

sys/net/include/net_help.h

@@ -15,6 +15,10 @@
 #include <string.h>
 #include <stdint.h>
 
+#if defined(__MACH__)
+#include "clang_compat.h"
+#endif
+
 #define BITSET(var,pos) ((var) & (1<<(pos)))
 #define HTONS(a) ((((uint16_t) (a) >> 8) & 0xff) | ((((uint16_t) (a)) & 0xff) << 8))
 #define HTONL(a) ((((uint32_t) (a) & 0xff000000) >> 24) | \

sys/net/include/sixlowpan/ip.h

@@ -25,8 +25,8 @@
 #include <stdint.h>
 
 #include "inet_ntop.h"
-#include "net_help.h"
 #include "net_if.h"
+#include "net_help.h"
 #include "sixlowpan/types.h"
 
 /**

sys/net/link_layer/net_if/net_if.c

@@ -18,10 +18,10 @@
 #include "ieee802154_frame.h"
 #include "msg.h"
 #include "mutex.h"
-#include "net_help.h"
 #include "transceiver.h"
 
 #include "net_if.h"
+#include "net_help.h"
 
 #define ENABLE_DEBUG    (0)
 #if ENABLE_DEBUG

sys/net/network_layer/sixlowpan/ip.c

@@ -25,7 +25,6 @@
 #include "vtimer.h"
 #include "mutex.h"
 #include "msg.h"
-#include "net_help.h"
 #include "net_if.h"
 #include "sixlowpan/mac.h"