diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/dfs/include/dfs_posix.h | 5 | ||||
| -rw-r--r-- | components/external/libpng/pngconf.h | 6 | ||||
| -rw-r--r-- | components/external/libz/zutil.c | 21 | ||||
| -rw-r--r-- | components/pthreads/posix_types.h | 18 |
4 files changed, 36 insertions, 14 deletions
diff --git a/components/dfs/include/dfs_posix.h b/components/dfs/include/dfs_posix.h index 1a8e179cbe..ad4d3fc167 100644 --- a/components/dfs/include/dfs_posix.h +++ b/components/dfs/include/dfs_posix.h @@ -10,7 +10,8 @@ * Change Logs:
* Date Author Notes
* 2009-05-27 Yi.qiu The first version.
- * 2010-07-18 Bernard add stat and statfs structure definitions.
+ * 2010-07-18 Bernard add stat and statfs structure definitions.
+ * 2011-05-16 Yi.qiu Change parameter name of rename, "new" is C++ key word.
*/
#ifndef __DFS_POSIX_H__
#define __DFS_POSIX_H__
@@ -100,7 +101,7 @@ int close(int d); int read(int fd, void *buf, size_t len);
int write(int fd, const void *buf, size_t len);
off_t lseek(int fd, off_t offset, int whence);
-int rename(const char* old, const char* new );
+int rename(const char *from, const char *to);
int unlink(const char *pathname);
int stat(const char *file, struct stat *buf);
int fstat(int fildes, struct stat *buf);
diff --git a/components/external/libpng/pngconf.h b/components/external/libpng/pngconf.h index 0cc2fc3551..047376302d 100644 --- a/components/external/libpng/pngconf.h +++ b/components/external/libpng/pngconf.h @@ -22,13 +22,13 @@ #ifdef __RT_THREAD__ #include <rtthread.h> #define PNG_MAX_MALLOC_64K +#define PNG_NO_STDIO #ifndef RT_USING_NEWLIB #define PNG_NO_WRITE_SUPPORTED -#define PNG_NO_STDIO #define PNG_NO_SETJMP_SUPPORTED -#define malloc rtgui_malloc
-#define free rtgui_free
+#define malloc rtgui_malloc +#define free rtgui_free #endif #endif diff --git a/components/external/libz/zutil.c b/components/external/libz/zutil.c index 19d2760e6c..16e9ac962e 100644 --- a/components/external/libz/zutil.c +++ b/components/external/libz/zutil.c @@ -291,6 +291,7 @@ void zcfree (voidpf opaque, voidpf ptr) #ifndef MY_ZCALLOC /* Any system without a special alloc function */ +#ifdef RT_USING_RTGUI extern voidp rtgui_malloc OF((uInt size)); extern voidp rtgui_calloc OF((uInt items, uInt size)); extern void rtgui_free OF((voidpf ptr)); @@ -312,5 +313,25 @@ void zcfree (opaque, ptr) rtgui_free(ptr); if (opaque) return; /* make compiler happy */ } +#else +voidpf zcalloc (opaque, items, size) + voidpf opaque; + unsigned items; + unsigned size; +{ + if (opaque) items += size - size; /* make compiler happy */ + return sizeof(uInt) > 2 ? (voidpf)rt_malloc(items * size) : + (voidpf)rt_calloc(items, size); +} + +void zcfree (opaque, ptr) + voidpf opaque; + voidpf ptr; +{ + rt_free(ptr); + if (opaque) return; /* make compiler happy */ +} + +#endif #endif /* MY_ZCALLOC */ diff --git a/components/pthreads/posix_types.h b/components/pthreads/posix_types.h index fd913aee2e..a2bb1aeac9 100644 --- a/components/pthreads/posix_types.h +++ b/components/pthreads/posix_types.h @@ -176,15 +176,15 @@ struct timeval { #include <dfs_posix.h>
#else
typedef rt_uint16_t mode_t;
-#define O_RDONLY 0000000
-#define O_WRONLY 0000001
-#define O_RDWR 0000002
-#define O_ACCMODE 0000003
-#define O_CREAT 0000100
-#define O_EXCL 0000200
-#define O_TRUNC 0001000
-#define O_APPEND 0002000
-#define O_DIRECTORY 0200000
+#define O_RDONLY 0x0000000
+#define O_WRONLY 0x0000001
+#define O_RDWR 0x0000002
+#define O_ACCMODE 0x0000003
+#define O_CREAT 0x0000100
+#define O_EXCL 0x0000200
+#define O_TRUNC 0x0001000
+#define O_APPEND 0x0002000
+#define O_DIRECTORY 0x0200000
#endif
#elif defined (__GNUC__) /* GNU GCC Compiler, with minilibc */
|