From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Mon, 8 Nov 2010 21:59:23 +0000 (+0000)
Subject: Update the IP address copy macro so it never relies on any byte alignment.
X-Git-Tag: V6.1.1~119
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d959d608b12f8d032c389628cb7a2710594eb2c3;p=freertos

Update the IP address copy macro so it never relies on any byte alignment.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1138 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---

diff --git a/Demo/Common/ethernet/FreeTCPIP/net/uip.h b/Demo/Common/ethernet/FreeTCPIP/net/uip.h
index 12e8242e3..88d8645a4 100644
--- a/Demo/Common/ethernet/FreeTCPIP/net/uip.h
+++ b/Demo/Common/ethernet/FreeTCPIP/net/uip.h
@@ -73,9 +73,6 @@
 	{
 		u8_t	u8[4];	/* Initializer, must come first!!! */
 		u16_t	u16[2];
-		#if 0
-			u32_t	u32;
-		#endif
 	} uip_ip4addr_t;
 	typedef uip_ip4addr_t	uip_ipaddr_t;
 #endif /* UIP_CONF_IPV6 */
@@ -1017,7 +1014,14 @@ CCIF void	uip_send( const void *data, int len );
  * \hideinitializer
  */
 #ifndef uip_ipaddr_copy
-	#define uip_ipaddr_copy( dest, src )	( ((unsigned long*)dest)[ 0 ] = ((unsigned long *)src)[ 0 ] )
+	#define uip_ipaddr_copy( dest, src ) 	\
+	do										\
+	{										\
+		(dest)->u8[0] = (src)->u8[0];		\
+		(dest)->u8[1] = (src)->u8[1];		\
+		(dest)->u8[2] = (src)->u8[2];		\
+		(dest)->u8[3] = (src)->u8[3];		\
+	} while( 0 )	
 #endif
 
 			/**