Merge branch 'lwip_dev' into devel

[palacios.git] / geekos / include / uip / uip-conf.h

diff --git a/geekos/include/uip/uip-conf.h b/geekos/include/uip/uip-conf.h
index 17a5d5e..6f23e05 100644 (file)
--- a/geekos/include/uip/uip-conf.h
+++ b/geekos/include/uip/uip-conf.h
@@ -69,7 +69,8 @@ extern int appcall(void);
  *
  * \hideinitializer
  */
-typedef unsigned char u8_t;
+//conflict with lwip
+//typedef unsigned char u8_t;
 
 /**
  * 16 bit datatype
@@ -78,7 +79,8 @@ typedef unsigned char u8_t;
  *
  * \hideinitializer
  */
-typedef unsigned short int u16_t;
+//confict with lwip
+//typedef unsigned short int u16_t;
 
 /**
  * Statistics datatype