Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fatfs: rename DIR to FF_DIR to avoid conflict with dirent.h

Browse source
This commit is contained in:
Ivan Grokhotkov 2017-01-03 03:45:11 +08:00 committed by Ivan Grokhotkov
parent 9398d1b1cc
commit d418776982
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/fatfs/src/ff.c
View file

@ -18,6 +18,7 @@
/----------------------------------------------------------------------------*/
#define FF_DEFINE_DIR
#include "ff.h" /* Declarations of FatFs API */
#include "diskio.h" /* Declarations of device I/O functions */

17
components/fatfs/src/ff.h
View file

@ -32,6 +32,9 @@ extern "C" {
#error Wrong configuration file (ffconf.h).
#endif
#ifdef FF_DEFINE_DIR
#define FF_DIR DIR
#endif
/* Definitions of volume management */
@ -179,7 +182,7 @@ typedef struct {
/* Directory object structure (DIR) */
/* Directory object structure (FF_DIR) */
typedef struct {
_FDID obj; /* Object identifier */
@ -194,7 +197,7 @@ typedef struct {
#if _USE_FIND
const TCHAR* pat; /* Pointer to the name matching pattern */
#endif
} DIR;
} FF_DIR;
@ -252,11 +255,11 @@ FRESULT f_write (FIL* fp, const void* buff, UINT btw, UINT* bw); /* Write data t
FRESULT f_lseek (FIL* fp, FSIZE_t ofs); /* Move file pointer of the file object */
FRESULT f_truncate (FIL* fp); /* Truncate the file */
FRESULT f_sync (FIL* fp); /* Flush cached data of the writing file */
FRESULT f_opendir (DIR* dp, const TCHAR* path); /* Open a directory */
FRESULT f_closedir (DIR* dp); /* Close an open directory */
FRESULT f_readdir (DIR* dp, FILINFO* fno); /* Read a directory item */
FRESULT f_findfirst (DIR* dp, FILINFO* fno, const TCHAR* path, const TCHAR* pattern); /* Find first file */
FRESULT f_findnext (DIR* dp, FILINFO* fno); /* Find next file */
FRESULT f_opendir (FF_DIR* dp, const TCHAR* path); /* Open a directory */
FRESULT f_closedir (FF_DIR* dp); /* Close an open directory */
FRESULT f_readdir (FF_DIR* dp, FILINFO* fno); /* Read a directory item */
FRESULT f_findfirst (FF_DIR* dp, FILINFO* fno, const TCHAR* path, const TCHAR* pattern); /* Find first file */
FRESULT f_findnext (FF_DIR* dp, FILINFO* fno); /* Find next file */
FRESULT f_mkdir (const TCHAR* path); /* Create a sub directory */
FRESULT f_unlink (const TCHAR* path); /* Delete an existing file or directory */
FRESULT f_rename (const TCHAR* path_old, const TCHAR* path_new); /* Rename/Move a file or directory */