Merged from trunk

[thirdparty/squid.git] / src / fs / ufs / ufscommon.h

diff --git a/src/fs/ufs/ufscommon.h b/src/fs/ufs/ufscommon.h
index 2aa6af59aa988e4fafbd6607eb94dbb0e7084ad2..66eb979bc6c2ca82cfb8e6e260988bfaa0872609 100644 (file)
--- a/src/fs/ufs/ufscommon.h
+++ b/src/fs/ufs/ufscommon.h
@@ -267,9 +267,7 @@ protected:
          * try to close again in the I/O callbacks.
          */
         bool try_closing;
-    }
-
-    flags;
+    } flags;
     link_list *pending_reads;
     link_list *pending_writes;
     void queueRead(char *, size_t, off_t, STRCB *, void *);
@@ -397,18 +395,10 @@ public:
 
     struct
     {
-
-unsigned int need_to_validate:
-        1;
-
-unsigned int clean:
-        1;
-
-unsigned int init:
-        1;
-    }
-
-    flags;
+        unsigned int need_to_validate:1;
+        unsigned int clean:1;
+        unsigned int init:1;
+    } flags;
     int in_dir;
     int done;
     int fn;