From e97ae6898fb23b42382bc0a2065a7d9d694b4a98 Mon Sep 17 00:00:00 2001 From: "bernard.xiong@gmail.com" Date: Wed, 5 Jan 2011 16:07:55 +0000 Subject: [PATCH] fix compiler warning. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1236 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- components/dfs/include/dfs_def.h | 21 ++++++++++++++------- components/dfs/include/dfs_posix.h | 4 ++++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/components/dfs/include/dfs_def.h b/components/dfs/include/dfs_def.h index 62ade80bd..ae1101f47 100644 --- a/components/dfs/include/dfs_def.h +++ b/components/dfs/include/dfs_def.h @@ -121,12 +121,12 @@ #define DFS_DT_DIR DT_DIR #else -#ifdef RT_USING_MINILIBC -#include -#else -typedef long off_t; -typedef int mode_t; -#endif + #ifdef RT_USING_MINILIBC + #include + #else + typedef long off_t; + typedef int mode_t; + #endif /* Device error codes */ #define DFS_STATUS_OK 0 /* no error */ @@ -165,10 +165,17 @@ typedef int mode_t; #define DFS_F_EOF 0x04000000 #define DFS_F_ERR 0x08000000 -/* Seek flags */ +/* Seek flags */ +#ifdef __CC_ARM +#include +#define DFS_SEEK_SET SEEK_SET +#define DFS_SEEK_CUR SEEK_CUR +#define DFS_SEEK_END SEEK_END +#else #define DFS_SEEK_SET 0 #define DFS_SEEK_CUR 1 #define DFS_SEEK_END 2 +#endif /* Stat codes */ #define DFS_S_IFMT 00170000 diff --git a/components/dfs/include/dfs_posix.h b/components/dfs/include/dfs_posix.h index b4b87b0a1..1a8e179cb 100644 --- a/components/dfs/include/dfs_posix.h +++ b/components/dfs/include/dfs_posix.h @@ -64,9 +64,13 @@ #define S_IWOTH DFS_S_IWOTH #define S_IXOTH DFS_S_IXOTH +#if defined(__CC_ARM) +#include +#else #define SEEK_SET DFS_SEEK_SET #define SEEK_CUR DFS_SEEK_CUR #define SEEK_END DFS_SEEK_END +#endif typedef struct { -- GitLab