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

The recent global change regarding htons allowed to remove this hack :-)

Browse source
This commit is contained in:
oliverschmidt 2010-10-19 20:30:47 +00:00
parent 5585d72c86
commit 842c6a018a
3 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cpu/native/net/wpcap.c
View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $Id: wpcap.c,v 1.19 2010/10/19 18:29:04 adamdunkels Exp $ * $Id: wpcap.c,v 1.20 2010/10/19 20:30:47 oliverschmidt Exp $
*/ */
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
@ -54,10 +54,6 @@
#define PRINTF(...) #define PRINTF(...)
#endif #endif
/* Avoid 'conflicting types' errors. */
#define uip_htonl
#define uip_htons
#include "contiki-net.h" #include "contiki-net.h"
#include "sys/log.h" #include "sys/log.h"

6
platform/win32/contiki-main.c
View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $Id: contiki-main.c,v 1.19 2010/10/19 18:29:05 adamdunkels Exp $ * $Id: contiki-main.c,v 1.20 2010/10/19 20:30:47 oliverschmidt Exp $
*/ */
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
@ -38,10 +38,6 @@
#include <winsock2.h> #include <winsock2.h>
#include <stdio.h> #include <stdio.h>
/* Avoid 'conflicting types' errors. */
#define uip_htonl
#define uip_htons
#include "contiki-net.h" #include "contiki-net.h"
#include "sys/clock.h" #include "sys/clock.h"

6
tools/wpcapslip/wpcap.c
View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $Id: wpcap.c,v 1.5 2010/10/19 18:29:05 adamdunkels Exp $ * $Id: wpcap.c,v 1.6 2010/10/19 20:30:47 oliverschmidt Exp $
*/ */
@ -66,10 +66,6 @@
#include <err.h> #include <err.h>
/* Avoid 'conflicting types' errors. */
#define uip_htonl
#define uip_htons
#define PROGRESS(x) #define PROGRESS(x)