X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=geekos%2Finclude%2Fuip%2Fuip-conf.h;h=6f23e05113379180ea0f93562a8e80ab642ccf5c;hb=afb2a35b2e15ba0fa932c4e49a3678f958a4502a;hp=17a5d5ec2cc6f3dade0d1fa5934b7c0dbe45264a;hpb=d38e1d6edeee83bfb1e3e3c6e2367faa5055bdfe;p=palacios.git

diff --git a/geekos/include/uip/uip-conf.h b/geekos/include/uip/uip-conf.h
index 17a5d5e..6f23e05 100644
--- 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