deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
Cleanup and fixes 002
This commit is contained in:
Oliver Schmidt 2013-04-22 04:51:44 -07:00
parent 424a7b2c8e 95eb505345
commit 96e85cc69a
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/program-handler/program-handler.c
View file

@ -52,6 +52,7 @@
#include "contiki.h" #include "contiki.h"
#include "ctk/ctk.h" #include "ctk/ctk.h"
#include "ctk/ctk-draw.h" #include "ctk/ctk-draw.h"
#include "sys/log.h"
#include "program-handler.h" #include "program-handler.h"

2
cpu/native/net/tapdev.c
View file

@ -111,7 +111,7 @@ tapdev_init(void)
memset(&ifr, 0, sizeof(ifr)); memset(&ifr, 0, sizeof(ifr));
ifr.ifr_flags = IFF_TAP|IFF_NO_PI; ifr.ifr_flags = IFF_TAP|IFF_NO_PI;
if (ioctl(fd, TUNSETIFF, (void *) &ifr) < 0) { if (ioctl(fd, TUNSETIFF, (void *) &ifr) < 0) {
perror(buf); perror("ioctl(TUNSETIFF)");
exit(1); exit(1);
} }
} }

4
platform/win32/contiki-conf.h
View file

@ -1,6 +1,10 @@
#ifndef __CONTIKI_CONF_H__ #ifndef __CONTIKI_CONF_H__
#define __CONTIKI_CONF_H__ #define __CONTIKI_CONF_H__
#ifdef __CYGWIN__
#include <sys/types.h>
#endif
#define CC_CONF_REGISTER_ARGS 1 #define CC_CONF_REGISTER_ARGS 1
#define CC_CONF_FASTCALL __fastcall #define CC_CONF_FASTCALL __fastcall
#define CC_CONF_INLINE __inline #define CC_CONF_INLINE __inline