--- gvpe/src/rohc/d_util.c	2004/02/08 06:02:44	1.1
+++ gvpe/src/rohc/d_util.c	2005/04/26 00:55:56	1.3
@@ -25,7 +25,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */    
 
 #include "d_util.h"
@@ -191,9 +191,9 @@
 	data++;
 	dest->protocol = GET_BIT_0_7(data);
 	data++;
-	dest->saddr = *((__u32 *)data);
+	dest->saddr = *((u32 *)data);
 	data += 4;
-	dest->daddr = *((__u32 *)data);
+	dest->daddr = *((u32 *)data);
 	return 10;
 }
 
@@ -201,9 +201,9 @@
 // Return the number of used bytes
 int d_decode_static_udp(const unsigned char *data, struct udphdr * dest)
 {
-        dest-> source = *((__u16 *)data);
+        dest-> source = *((u16 *)data);
 	data += 2;
-	dest-> dest = *((__u16 *)data);
+	dest-> dest = *((u16 *)data);
 	return 4;
 }
 
@@ -216,7 +216,7 @@
 	data++;
 	dest->ttl = GET_BIT_0_7(data);
 	data++;
-	dest-> id = *((__u16 *)data);
+	dest-> id = *((u16 *)data);
 	data += 2;
 	if(GET_BIT_7(data)){
 		dest->frag_off = htons(0x4000);
@@ -233,7 +233,7 @@
 // Return the number of used bytes
 int d_decode_dynamic_udp(const unsigned char *data, struct udphdr * dest)
 {
-        dest-> check = *((__u16 *)data);
+        dest-> check = *((u16 *)data);
 	return 2;
 }
 
@@ -241,9 +241,9 @@
 // Return the number of used bytes
 int d_decode_dynamic_udp_lite(const unsigned char *data, struct udphdr * dest)
 {
-	dest-> len = *((__u16 *)data);
+	dest-> len = *((u16 *)data);
 	data += 2;
-        dest-> check = *((__u16 *)data);
+        dest-> check = *((u16 *)data);
 	return 4;
 }