3 files changed, 4 insertions, 5 deletions
diff --git a/MdeModulePkg/Include/Library/NetLib.h b/MdeModulePkg/Include/Library/NetLib.h
index fe240442ae..8787f6cf7a 100644
--- a/MdeModulePkg/Include/Library/NetLib.h
+++ b/MdeModulePkg/Include/Library/NetLib.h
@@ -188,7 +188,7 @@ typedef struct {
 //
 #define EFI_IP4(EfiIpAddr)       (*(IP4_ADDR *) ((EfiIpAddr).Addr))
 #define EFI_NTOHL(EfiIp)         (NTOHL (EFI_IP4 ((EfiIp))))
-#define EFI_IP4_EQUAL(Ip1, Ip2)  (NetCompareMem (&(Ip1), &(Ip2), sizeof (EFI_IPv4_ADDRESS)) == 0)
+#define EFI_IP4_EQUAL(Ip1, Ip2)  (NetCompareMem ((Ip1), (Ip2), sizeof (EFI_IPv4_ADDRESS)) == 0)
 
 INTN
 NetGetMaskLength (
@@ -249,7 +249,7 @@ extern EFI_IPv4_ADDRESS  mZeroIp4Addr;
 
 #define NET_MIN(a, b)           ((a) < (b) ? (a) : (b))
 #define NET_MAX(a, b)           ((a) > (b) ? (a) : (b))
-#define NET_RANDOM(Seed)        (((Seed) * 1103515245L + 12345) % 4294967295L)
+#define NET_RANDOM(Seed)        ((UINT32) ((UINT32) (Seed) * 1103515245UL + 12345) % 4294967295UL)
 
 
 UINT32
diff --git a/MdeModulePkg/Include/Library/UdpIoLib.h b/MdeModulePkg/Include/Library/UdpIoLib.h
index 3f49cc9209..c6059f18e3 100644
--- a/MdeModulePkg/Include/Library/UdpIoLib.h
+++ b/MdeModulePkg/Include/Library/UdpIoLib.h
@@ -99,7 +99,7 @@ typedef struct {
   EFI_UDP4_TRANSMIT_DATA    UdpTxData;
 } UDP_TX_TOKEN;
 
-typedef struct _UDP_IO_PORT {
+struct _UDP_IO_PORT {
   UINT32                    Signature;
   NET_LIST_ENTRY            Link;
   INTN                      RefCnt;
diff --git a/MdeModulePkg/Include/Protocol/NicIp4Config.h b/MdeModulePkg/Include/Protocol/NicIp4Config.h
index cf8cf27dc0..da3888881a 100644
--- a/MdeModulePkg/Include/Protocol/NicIp4Config.h
+++ b/MdeModulePkg/Include/Protocol/NicIp4Config.h
@@ -38,7 +38,7 @@ Abstract:
 
 typedef struct _EFI_NIC_IP4_CONFIG_PROTOCOL EFI_NIC_IP4_CONFIG_PROTOCOL;
 
-typedef enum {
+enum {
   //
   // Config source: dhcp or static
   //
@@ -111,7 +111,6 @@ EFI_STATUS
   IN  NIC_ADDR                    *NicAddr       OPTIONAL
   );
 
-typedef
 struct _EFI_NIC_IP4_CONFIG_PROTOCOL {
   EFI_NIC_IP4_CONFIG_GET_NAME     GetName;
   EFI_NIC_IP4_CONFIG_GET_INFO     GetInfo;