From 40595ad5c7914d779971d2a2363dd0eb91fe3e35 Mon Sep 17 00:00:00 2001
From: Niclas Finne <nfi@sics.se>
Date: Mon, 7 May 2012 13:16:27 +0200
Subject: [PATCH] Support for serialdump on MacOS X. Patch by Laurent Deru.

---
 platform/sky/Makefile.common | 2 +-
 tools/sky/serialdump.c       | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/platform/sky/Makefile.common b/platform/sky/Makefile.common
index c6bb0dc93..53d680863 100644
--- a/platform/sky/Makefile.common
+++ b/platform/sky/Makefile.common
@@ -62,7 +62,7 @@ else
 ifeq ($(HOST_OS),Darwin)
   ifndef MOTELIST
     USBDEVPREFIX=
-    SERIALDUMP = $(CONTIKI)/tools/sky/serialdump-linux
+    SERIALDUMP = $(CONTIKI)/tools/sky/serialdump-macos
     MOTELIST = $(CONTIKI)/tools/sky/motelist-macos
     TMOTE_BSL_FILE = tmote-bsl-linux
     TMOTE_BSL=$(if $(wildcard $(CONTIKI)/tools/sky/$(TMOTE_BSL_FILE)),1,0)
diff --git a/tools/sky/serialdump.c b/tools/sky/serialdump.c
index eb16b2660..ce6c2ae32 100644
--- a/tools/sky/serialdump.c
+++ b/tools/sky/serialdump.c
@@ -4,6 +4,8 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/time.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define BAUDRATE B57600
 #define BAUDRATE_S "57600"
@@ -159,7 +161,11 @@ int main(int argc, char **argv)
   }
   fprintf(stderr, "connecting to %s (%s)", device, speedname);
 
+#ifndef __APPLE__
   fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY | O_DIRECT | O_SYNC );
+#else
+  fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY | O_SYNC );
+#endif
   if (fd <0) {
     fprintf(stderr, "\n");
     perror(device);