diff options
| author | px4dev <px4@purgatory.org> | 2012-09-02 12:17:16 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2012-09-02 12:17:16 -0700 |
| commit | 6576edb47e9d0e032a89f01d9fb071871d53b553 (patch) | |
| tree | 452c0de8053abec11bfc102a3480c666adb6282b /nuttx/include | |
| parent | 8aa41f7d34c6b6cddc59ba9d5ed1567044e66e46 (diff) | |
| parent | 1349b00b418de388310c6658fd799a9049ddd38b (diff) | |
| download | px4-firmware-6576edb47e9d0e032a89f01d9fb071871d53b553.tar.gz px4-firmware-6576edb47e9d0e032a89f01d9fb071871d53b553.tar.bz2 px4-firmware-6576edb47e9d0e032a89f01d9fb071871d53b553.zip | |
Merge with trunk NuttX
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5079 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/include')
| -rw-r--r-- | nuttx/include/assert.h | 4 | ||||
| -rw-r--r-- | nuttx/include/libgen.h | 4 | ||||
| -rw-r--r-- | nuttx/include/netinet/ether.h | 2 | ||||
| -rw-r--r-- | nuttx/include/nuttx/init.h | 2 | ||||
| -rw-r--r-- | nuttx/include/stdio.h | 1 |
5 files changed, 9 insertions, 4 deletions
diff --git a/nuttx/include/assert.h b/nuttx/include/assert.h index 89606b6f6..31c9edf48 100644 --- a/nuttx/include/assert.h +++ b/nuttx/include/assert.h @@ -91,6 +91,10 @@ #endif +#ifndef assert +#define assert ASSERT +#endif + /**************************************************************************** * Included Files ****************************************************************************/ diff --git a/nuttx/include/libgen.h b/nuttx/include/libgen.h index e65948376..0d42dc778 100644 --- a/nuttx/include/libgen.h +++ b/nuttx/include/libgen.h @@ -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 diff --git a/nuttx/include/netinet/ether.h b/nuttx/include/netinet/ether.h index f11fef6db..69b8fbba6 100644 --- a/nuttx/include/netinet/ether.h +++ b/nuttx/include/netinet/ether.h @@ -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); diff --git a/nuttx/include/nuttx/init.h b/nuttx/include/nuttx/init.h index ecdad702f..2d1b3c693 100644 --- a/nuttx/include/nuttx/init.h +++ b/nuttx/include/nuttx/init.h @@ -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 *****************************************/ diff --git a/nuttx/include/stdio.h b/nuttx/include/stdio.h index 82bf0eaf6..e9218046c 100644 --- a/nuttx/include/stdio.h +++ b/nuttx/include/stdio.h @@ -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); |