diff --git a/cpu/native/net/wpcap.c b/cpu/native/net/wpcap.c index 2a18f8188..b0d6af43b 100644 --- a/cpu/native/net/wpcap.c +++ b/cpu/native/net/wpcap.c @@ -30,7 +30,7 @@ * * Author: Oliver Schmidt * - * $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 @@ -54,10 +54,6 @@ #define PRINTF(...) #endif -/* Avoid 'conflicting types' errors. */ -#define uip_htonl -#define uip_htons - #include "contiki-net.h" #include "sys/log.h" diff --git a/platform/win32/contiki-main.c b/platform/win32/contiki-main.c index 213e12cce..489618bb1 100644 --- a/platform/win32/contiki-main.c +++ b/platform/win32/contiki-main.c @@ -30,7 +30,7 @@ * * Author: Oliver Schmidt * - * $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 @@ -38,10 +38,6 @@ #include #include -/* Avoid 'conflicting types' errors. */ -#define uip_htonl -#define uip_htons - #include "contiki-net.h" #include "sys/clock.h" diff --git a/tools/wpcapslip/wpcap.c b/tools/wpcapslip/wpcap.c index 4949786ae..5ad816184 100644 --- a/tools/wpcapslip/wpcap.c +++ b/tools/wpcapslip/wpcap.c @@ -30,7 +30,7 @@ * * Author: Oliver Schmidt * - * $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 -/* Avoid 'conflicting types' errors. */ -#define uip_htonl -#define uip_htons - #define PROGRESS(x)