From 615888e1ee963809b4cbda64e659fc988bb70e2f Mon Sep 17 00:00:00 2001
From: "dbaron%dbaron.org" <dbaron%dbaron.org>
Date: Fri, 5 May 2006 16:27:23 +0000
Subject: [PATCH] Fix Windows tinderbox orange.  b=336333  Patch by Masatoshi
 Kimura (:emk) <VYV03354@nifty.ne.jp>.  r=dbaron

---
 netwerk/system/win32/nsNotifyAddrListener.cpp | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/netwerk/system/win32/nsNotifyAddrListener.cpp b/netwerk/system/win32/nsNotifyAddrListener.cpp
index c5e7a4037524..fc09f442e648 100644
--- a/netwerk/system/win32/nsNotifyAddrListener.cpp
+++ b/netwerk/system/win32/nsNotifyAddrListener.cpp
@@ -93,13 +93,13 @@ typedef enum {
 } IP_DAD_STATE;
 
 typedef struct _IP_ADAPTER_UNICAST_ADDRESS {
-    union u {
+    union {
         ULONGLONG Alignment;
-        struct s { 
+        struct {
             ULONG Length;
             DWORD Flags;
-        };
-    };
+        } s;
+    } u;
     struct _IP_ADAPTER_UNICAST_ADDRESS *Next;
     SOCKET_ADDRESS Address;
 
@@ -113,37 +113,37 @@ typedef struct _IP_ADAPTER_UNICAST_ADDRESS {
 } IP_ADAPTER_UNICAST_ADDRESS, *PIP_ADAPTER_UNICAST_ADDRESS;
 
 typedef struct _IP_ADAPTER_ANYCAST_ADDRESS {
-    union u {
+    union {
         ULONGLONG Alignment;
-        struct s { 
+        struct {
             ULONG Length;
             DWORD Flags;
-        };
-    };
+        } s;
+    } u;
     struct _IP_ADAPTER_ANYCAST_ADDRESS *Next;
     SOCKET_ADDRESS Address;
 } IP_ADAPTER_ANYCAST_ADDRESS, *PIP_ADAPTER_ANYCAST_ADDRESS;
 
 typedef struct _IP_ADAPTER_MULTICAST_ADDRESS {
-    union u {
+    union {
         ULONGLONG Alignment;
-        struct s {
+        struct {
             ULONG Length;
             DWORD Flags;
-        };
-    };
+        } s;
+    } u;
     struct _IP_ADAPTER_MULTICAST_ADDRESS *Next;
     SOCKET_ADDRESS Address;
 } IP_ADAPTER_MULTICAST_ADDRESS, *PIP_ADAPTER_MULTICAST_ADDRESS;
 
 typedef struct _IP_ADAPTER_DNS_SERVER_ADDRESS {
-    union u {
+    union {
         ULONGLONG Alignment;
-        struct s {
+        struct {
             ULONG Length;
             DWORD Reserved;
-        };
-    };
+        } s;
+    } u;
     struct _IP_ADAPTER_DNS_SERVER_ADDRESS *Next;
     SOCKET_ADDRESS Address;
 } IP_ADAPTER_DNS_SERVER_ADDRESS, *PIP_ADAPTER_DNS_SERVER_ADDRESS;
@@ -159,13 +159,13 @@ typedef enum {
 } IF_OPER_STATUS;
 
 typedef struct _IP_ADAPTER_ADDRESSES {
-    union u {
+    union {
         ULONGLONG Alignment;
-        struct s {
+        struct {
             ULONG Length;
             DWORD IfIndex;
-        };
-    };
+        } s;
+    } u;
     struct _IP_ADAPTER_ADDRESSES *Next;
     PCHAR AdapterName;
     PIP_ADAPTER_UNICAST_ADDRESS FirstUnicastAddress;