diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-12-28 22:10:14 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-12-28 22:10:14 +0000 |
commit | 7e806d1ed76f03fbab77ab38b148b2a9c02eeba1 (patch) | |
tree | b399e63bc5d73c26a65e9ee3544d3daad8aba30f /nuttx/include | |
parent | c52a6d1e1d227b3acc746f0f435214f663a5b3a8 (diff) | |
download | px4-nuttx-7e806d1ed76f03fbab77ab38b148b2a9c02eeba1.tar.gz px4-nuttx-7e806d1ed76f03fbab77ab38b148b2a9c02eeba1.tar.bz2 px4-nuttx-7e806d1ed76f03fbab77ab38b148b2a9c02eeba1.zip |
Fixed for 8051 w/SDCC compiler
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@454 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/include')
-rw-r--r-- | nuttx/include/arpa/inet.h | 27 | ||||
-rw-r--r-- | nuttx/include/stdlib.h | 4 | ||||
-rw-r--r-- | nuttx/include/sys/types.h | 2 |
3 files changed, 23 insertions, 10 deletions
diff --git a/nuttx/include/arpa/inet.h b/nuttx/include/arpa/inet.h index ee0b1be70..15871ef3c 100644 --- a/nuttx/include/arpa/inet.h +++ b/nuttx/include/arpa/inet.h @@ -91,15 +91,28 @@ EXTERN uint16 htons (uint16 hs); /* Functions to manipulate address representations */ -EXTERN int inet_aton(const char *cp, struct in_addr *inp); -EXTERN in_addr_t inet_addr(const char *cp); -EXTERN in_addr_t inet_network(const char *cp); -EXTERN char *inet_ntoa(struct in_addr in); -EXTERN struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host); +EXTERN int inet_aton(FAR const char *cp, FAR struct in_addr *inp); +EXTERN in_addr_t inet_addr(FAR const char *cp); +EXTERN in_addr_t inet_network(FAR const char *cp); + +#ifdef CONFIG_CAN_PASS_STRUCTS +EXTERN FAR char *inet_ntoa(struct in_addr in); EXTERN in_addr_t inet_lnaof(struct in_addr in); EXTERN in_addr_t inet_netof(struct in_addr in); -EXTERN int inet_pton(int af, const char *cp, void *buf); -EXTERN const char *inet_ntop(int af, const void *cp, char *buf, socklen_t len); +#else +EXTERN FAR char *_inet_ntoa(in_addr_t in); +# define inet_ntoa(in) _inet_ntoa(in.s_addr); + +EXTERN in_addr_t _inet_lnaof(in_addr_t in); +# define inet_lnaof(in) _inet_lnaof(in.s_addr); + +EXTERN in_addr_t _inet_netof(in_addr_t in); +# define inet_netof(in) _inet_netof(in.s_addr); +#endif +EXTERN struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host); + +EXTERN int inet_pton(int af, FAR const char *cp, FAR void *buf); +EXTERN const char *inet_ntop(int af, FAR const void *cp, FAR char *buf, socklen_t len); #undef EXTERN #ifdef __cplusplus diff --git a/nuttx/include/stdlib.h b/nuttx/include/stdlib.h index 6e7f44112..c1eaf28d0 100644 --- a/nuttx/include/stdlib.h +++ b/nuttx/include/stdlib.h @@ -105,8 +105,8 @@ EXTERN int rand(void); #ifndef CONFIG_DISABLE_ENIVRON EXTERN FAR char **get_environ_ptr( void ); -EXTERN FAR char *getenv(const char *name); -EXTERN int putenv(char *string); +EXTERN FAR char *getenv(FAR const char *name); +EXTERN int putenv(FAR char *string); EXTERN int clearenv(void); EXTERN int setenv(const char *name, const char *value, int overwrite); EXTERN int unsetenv(const char *name); diff --git a/nuttx/include/sys/types.h b/nuttx/include/sys/types.h index 1788784b5..0460c5e5c 100644 --- a/nuttx/include/sys/types.h +++ b/nuttx/include/sys/types.h @@ -1,5 +1,5 @@ /************************************************************ - * types.h + * sys/types.h * * Copyright (C) 2007 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> |