Merge with trunk NuttX

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5079 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
px4dev
2012-09-02 12:17:16 -07:00
154 changed files with 2179 additions and 706 deletions
+4
View File
@@ -91,6 +91,10 @@
#endif
#ifndef assert
#define assert ASSERT
#endif
/****************************************************************************
* Included Files
****************************************************************************/
+2 -2
View File
@@ -55,8 +55,8 @@ extern "C" {
#define EXTERN extern
#endif
EXTERN char *basename(char *path);
EXTERN char *dirname(char *path);
EXTERN FAR char *basename(FAR char *path);
EXTERN FAR char *dirname(FAR char *path);
#undef EXTERN
#ifdef __cplusplus
+1 -1
View File
@@ -63,7 +63,7 @@ extern "C" {
#define EXTERN extern
#endif
EXTERN char *ether_ntoa(const struct ether_addr *addr);
EXTERN FAR char *ether_ntoa(FAR const struct ether_addr *addr);
EXTERN struct ether_addr *ether_aton(const char *asc);
EXTERN int ether_ntohost(char *hostname, const struct ether_addr *addr);
EXTERN int ether_hostton(const char *hostname, struct ether_addr *addr);
+1 -1
View File
@@ -68,7 +68,7 @@ extern "C" {
/* This entry point must be supplied by the application */
EXTERN int user_start(int argc, char *argv[]);
EXTERN int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
/* Functions contained in os_task.c *****************************************/
+1
View File
@@ -128,6 +128,7 @@ EXTERN int sprintf(FAR char *buf, const char *format, ...);
EXTERN int asprintf (FAR char **ptr, const char *fmt, ...);
EXTERN int snprintf(FAR char *buf, size_t size, const char *format, ...);
EXTERN int sscanf(const char *buf, const char *fmt, ...);
EXTERN void perror(FAR const char *s);
EXTERN int ungetc(int c, FAR FILE *stream);
EXTERN int vprintf(FAR const char *format, va_list ap);