summaryrefslogtreecommitdiff
path: root/components/dfs/include
diff options
context:
space:
mode:
author[email protected] <[email protected]>2011-01-05 16:07:55 +0000
committer[email protected] <[email protected]>2011-01-05 16:07:55 +0000
commite97ae6898fb23b42382bc0a2065a7d9d694b4a98 (patch)
tree634233abb42aac24c506fc9c52edb94157160399 /components/dfs/include
parentb8e36ea5452b9164b7c77071abaf735620948e01 (diff)
fix compiler warning.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1236 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'components/dfs/include')
-rw-r--r--components/dfs/include/dfs_def.h21
-rw-r--r--components/dfs/include/dfs_posix.h4
2 files changed, 18 insertions, 7 deletions
diff --git a/components/dfs/include/dfs_def.h b/components/dfs/include/dfs_def.h
index 62ade80bd2..ae1101f47f 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 <string.h>
-#else
-typedef long off_t;
-typedef int mode_t;
-#endif
+ #ifdef RT_USING_MINILIBC
+ #include <string.h>
+ #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 <stdio.h>
+#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 b4b87b0a11..1a8e179cbe 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 <stdio.h>
+#else
#define SEEK_SET DFS_SEEK_SET
#define SEEK_CUR DFS_SEEK_CUR
#define SEEK_END DFS_SEEK_END
+#endif
typedef struct
{