--- gvpe/src/rohc/d_udp.c	2004/02/08 06:02:44	1.1
+++ gvpe/src/rohc/d_udp.c	2004/02/08 07:24:25	1.2
@@ -29,11 +29,10 @@
 */    
 // The UDP profile in the decompressor
 
-#include <asm/byteorder.h>
-
 #include "rohc.h"
 #include "decomp.h"
 
+#include "d_ip.h"
 #include "d_udp.h"
 #include "d_util.h"
 #include "comp.h"
@@ -318,7 +317,7 @@
 		pro->udp_checksum_present = active1->udp.check;
 
 		// Get and set SN
-		sn = ntohs(* ((__u16 *)s));
+		sn = ntohs(* ((u16 *)s));
 		d_lsb_init(&pro->sn, sn, -1);
 		d_ip_id_init(&pro->ip_id1, ntohs(active1->ip.id), sn);
 		s += 2;
@@ -808,7 +807,7 @@
 	size = d_decode_dynamic_udp(src2, &active1->udp);
 	src2 += size; payload_size -= size;
 
-	sn = ntohs(* ((__u16 *)src2));
+	sn = ntohs(* ((u16 *)src2));
 	d_lsb_init(&pro->sn, sn, -1);
 	d_ip_id_init(&pro->ip_id1,ntohs(active1->ip.id), sn);
 
@@ -874,7 +873,7 @@
 	*sn = d_lsb_decode(&pro->sn, sn_bits, number_of_sn_bits);
 
  	if (active1->rnd) {
-		*id = ntohs(*((__u16 *)src));
+		*id = ntohs(*((u16 *)src));
 		src += 2; field_counter +=2; *payload_size -= 2;
 
 	} else {
@@ -888,7 +887,7 @@
 	if (pro->multiple_ip){
 
 		if (active2->rnd) {
-			*id2 = ntohs(*((__u16 *)src));
+			*id2 = ntohs(*((u16 *)src));
 
 			src +=2; field_counter +=2; *payload_size -= 2;
 		} else {
@@ -898,7 +897,7 @@
 	// If checksum present
 	if(pro->udp_checksum_present){
 		rohc_debugf(2,"(decompress) upd checksum present\n");
-		checksum = ntohs(*((__u16 *)src));
+		checksum = ntohs(*((u16 *)src));
 		src +=2; field_counter +=2; *payload_size -= 2;
 	}
 	rohc_debugf(2,"(decomp) udp checksum %x payload size = %d\n",checksum,*payload_size);
@@ -1020,20 +1019,20 @@
 
 	// Random IP ID ?
 	if (active1->rnd) {
-		*id = ntohs(*((__u16 *)src2));
+		*id = ntohs(*((u16 *)src2));
 		src2 +=2; field_counter +=2; *payload_size -= 2;
 	}
 
 	// Multiple ip-header
 
 	if (( pro->multiple_ip )&&( active2->rnd )){
-		*id2 = ntohs(*((__u16 *)src2));
+		*id2 = ntohs(*((u16 *)src2));
 		src2 +=2; field_counter +=2; *payload_size -= 2;
 	}
 
 	// If checksum present
 	if(pro->udp_checksum_present){
-		checksum = ntohs(*((__u16 *)src2));
+		checksum = ntohs(*((u16 *)src2));
 		src2 +=2; field_counter +=2; *payload_size -= 2;
 	}
 
@@ -1152,11 +1151,11 @@
 	}
 	if (I) {
 		if(pro->multiple_ip){
-			active2->ip.id = *((__u16 *)fields);
+			active2->ip.id = *((u16 *)fields);
 			fields += 2;
 			*update_id2 = 1;
 		}else{
-			active1->ip.id = *((__u16 *)fields);
+			active1->ip.id = *((u16 *)fields);
 			fields += 2;
 			*ip_id_changed = 1;
 		}
@@ -1289,7 +1288,7 @@
 	*rnd = GET_BIT_1(flags);
 
 	if (GET_BIT_0(flags)) {
-		ip->id = *((__u16 *)fields);
+		ip->id = *((u16 *)fields);
 		fields += 2; size += 2;
 		*updated_id = 1;
 	}