Merge of branches/team/network/new_stack - not yet complete as SVN does only support

replacing files when merging when you don't have deleted them manually (for some reason,
it only works as part of the merge operation, and we didn't copy the whole tree to
have "a fresh start" - next time we know better, at least if SVN still suffers from
that same limitation).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18456 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/posix/netinet/ip.h

@@ -5,7 +5,6 @@
 #ifndef _NETINET_IP_H
 #define _NETINET_IP_H
 
-#include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <stdint.h>
 
@@ -81,10 +80,10 @@ struct  ip_timestamp {
 			ipt_oflw:4;
 #endif
 	union ipt_timestamp {
-		n_time ipt_time[1];
+		uint32_t ipt_time[1];
 		struct ipt_ta {
 			struct in_addr ipt_addr;
-			n_time ipt_time;
+			uint32_t ipt_time;
 		} ipt_ta;
 	} ipt_timestamp;
 };