FAT-FreeRTOS#50: Fixing duplicate definition of st_atime, st_mtime, s…

…t_ctime for linux.
phelter · Aug 8, 2023 · d4d2c9b · d4d2c9b
1 parent cec9a7b
commit d4d2c9b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ff_stdio.c b/ff_stdio.c
@@ -1137,9 +1137,9 @@ int ff_stat( const char * pcName,
 
         #if ( ffconfigTIME_SUPPORT == 1 )
             {
-                pxStatBuffer->st_atime = prvFileTime( &( xDirEntry.xAccessedTime ) );
-                pxStatBuffer->st_mtime = prvFileTime( &( xDirEntry.xModifiedTime ) );
-                pxStatBuffer->st_ctime = prvFileTime( &( xDirEntry.xCreateTime ) );
+                pxStatBuffer->ff_atime = prvFileTime( &( xDirEntry.xAccessedTime ) );
+                pxStatBuffer->ff_mtime = prvFileTime( &( xDirEntry.xModifiedTime ) );
+                pxStatBuffer->ff_ctime = prvFileTime( &( xDirEntry.xCreateTime ) );
             }
         #endif
     }

diff --git a/include/ff_stdio.h b/include/ff_stdio.h
@@ -89,9 +89,9 @@
 
         /* Note time_t must be used here otherwise will have bugs when 2032 (uint32_t second clock rolls over) */
         #if ( ffconfigTIME_SUPPORT == 1 )
-            time_t st_atime;
-            time_t st_mtime;
-            time_t st_ctime;
+            time_t ff_atime;
+            time_t ff_mtime;
+            time_t ff_ctime;
         #endif /* ffconfigTIME_SUPPORT */
     } FF_Stat_t;