Merge pull request contiki-os#203 from mmuman/cleanup-and-fixes-002

Cleanup and fixes 002
guoger · Apr 22, 2013 · 96e85cc · 96e85cc
2 parents 424a7b2 + 95eb505
commit 96e85cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/apps/program-handler/program-handler.c b/apps/program-handler/program-handler.c
@@ -52,6 +52,7 @@
 #include "contiki.h"
 #include "ctk/ctk.h"
 #include "ctk/ctk-draw.h"
+#include "sys/log.h"
 
 #include "program-handler.h"
 

diff --git a/cpu/native/net/tapdev.c b/cpu/native/net/tapdev.c
@@ -111,7 +111,7 @@ tapdev_init(void)
     memset(&ifr, 0, sizeof(ifr));
     ifr.ifr_flags = IFF_TAP|IFF_NO_PI;
     if (ioctl(fd, TUNSETIFF, (void *) &ifr) < 0) {
-      perror(buf);
+      perror("ioctl(TUNSETIFF)");
       exit(1);
     }
   }

diff --git a/platform/win32/contiki-conf.h b/platform/win32/contiki-conf.h
@@ -1,6 +1,10 @@
 #ifndef __CONTIKI_CONF_H__
 #define __CONTIKI_CONF_H__
 
+#ifdef __CYGWIN__
+#include <sys/types.h>
+#endif
+
 #define CC_CONF_REGISTER_ARGS 1
 #define CC_CONF_FASTCALL __fastcall
 #define CC_CONF_INLINE   __inline