Fix explorer build a bit.

svn path=/branches/ros-amd64-bringup/; revision=37122

diff --git a/reactos/base/shell/explorer/shell/fatfs.cpp b/reactos/base/shell/explorer/shell/fatfs.cpp
index 8750637..ba2017e 100644 (file)
--- a/reactos/base/shell/explorer/shell/fatfs.cpp
+++ b/reactos/base/shell/explorer/shell/fatfs.cpp
@@ -148,8 +148,8 @@ void FATDirectory::read_directory(int scan_flags)
                        w32fd.nFileSizeLow = e.size;
 
                         // convert date/time attribute into FILETIME
-                       const fdate& date = e.date;
-                       const ftime& time = e.time;
+                       const filedate& date = e.date;
+                       const filetime& time = e.time;
                        SYSTEMTIME stime;
                        FILETIME ftime;
 

diff --git a/reactos/base/shell/explorer/shell/fatfs.h b/reactos/base/shell/explorer/shell/fatfs.h
index cf97630..8c267da 100644 (file)
--- a/reactos/base/shell/explorer/shell/fatfs.h
+++ b/reactos/base/shell/explorer/shell/fatfs.h
@@ -118,13 +118,13 @@ struct BootSector32 {
 };
 
 
-struct ftime {
+struct filetime {
        WORD    sec2    : 5;
        WORD    min     : 6;
        WORD    hour    : 5;
 };
 
-struct fdate {
+struct filedate {
        WORD    day     : 5;
        WORD    month   : 4;
        WORD    year    : 7;
@@ -150,15 +150,15 @@ struct DEntry_E {
        char                    ext[3];
        char                    attr;
        char                    rsrvd[10];
-       struct ftime    time;
-       struct fdate    date;
+       struct filetime time;
+       struct filedate date;
        WORD                    fclus;
        DWORD                   size;
 };
 
 union DEntry {
        DEntry_E E;
-       BYTE B[8+3+1+10+sizeof(struct ftime)+sizeof(struct fdate)+sizeof(WORD)+sizeof(DWORD)];
+       BYTE B[8+3+1+10+sizeof(struct filetime)+sizeof(struct filedate)+sizeof(WORD)+sizeof(DWORD)];
 };
 
 #pragma pack(pop)