diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-14 23:32:23 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-14 23:32:23 +0000 |
| commit | d7d4a0d765d12cc152c62a37b490702c39d76447 (patch) | |
| tree | d3969c50e49cd742124e05349431556344a93f54 /nuttx/include/netinet | |
| parent | 313eb5bb780f9e9baa353651996b51ce33a85fca (diff) | |
| download | nuttx-d7d4a0d765d12cc152c62a37b490702c39d76447.tar.gz nuttx-d7d4a0d765d12cc152c62a37b490702c39d76447.tar.bz2 nuttx-d7d4a0d765d12cc152c62a37b490702c39d76447.zip | |
Switching to C99 stdint.h types
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2340 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/include/netinet')
| -rw-r--r-- | nuttx/include/netinet/arp.h | 27 | ||||
| -rw-r--r-- | nuttx/include/netinet/ether.h | 4 | ||||
| -rw-r--r-- | nuttx/include/netinet/in.h | 7 |
3 files changed, 21 insertions, 17 deletions
diff --git a/nuttx/include/netinet/arp.h b/nuttx/include/netinet/arp.h index 908f5790a..4c2ad205d 100644 --- a/nuttx/include/netinet/arp.h +++ b/nuttx/include/netinet/arp.h @@ -41,11 +41,12 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + +#include <stdint.h> #include <nuttx/ioctl.h> /**************************************************************************** - * Public Definitions + * Pre-processor Definitions ****************************************************************************/ /* Three ioctls are available on all PF_INET sockets, but only if the NuttX @@ -59,12 +60,12 @@ /* Values for the FLAGS field in struct arpreq */ -#define ATF_COM 0x01 /* Lookup complete */ -#define ATF_PERM 0x02 /* Permanent entry */ -#define ATF_PUBL 0x04 /* Publish entry */ -#define ATF_USETRAILERS 0x10 /* Trailers requested */ -#define ATF_NETMASK 0x20 /* Use a netmask */ -#define ATF_DONTPUB 0x40 /* Don't answer */ +#define ATF_COM 0x01 /* Lookup complete */ +#define ATF_PERM 0x02 /* Permanent entry */ +#define ATF_PUBL 0x04 /* Publish entry */ +#define ATF_USETRAILERS 0x10 /* Trailers requested */ +#define ATF_NETMASK 0x20 /* Use a netmask */ +#define ATF_DONTPUB 0x40 /* Don't answer */ /**************************************************************************** * Public Type Definitions @@ -74,11 +75,11 @@ struct arpreq { - struct sockaddr arp_pa; /* Protocol address */ - struct sockaddr arp_ha; /* Hardware address */ - struct sockaddr arp_netmask; /* Netmask of protocol address */ - ubyte arp_flags; /* Flags */ - ubyte arp_dev[IFNAMSIZ+1]; /* Device name (zero terminated)*/ + struct sockaddr arp_pa; /* Protocol address */ + struct sockaddr arp_ha; /* Hardware address */ + struct sockaddr arp_netmask; /* Netmask of protocol address */ + uint8_t arp_flags; /* Flags */ + uint8_t arp_dev[IFNAMSIZ+1]; /* Device name (zero terminated)*/ }; /**************************************************************************** diff --git a/nuttx/include/netinet/ether.h b/nuttx/include/netinet/ether.h index 3cd2d3ad4..9264bbbbe 100644 --- a/nuttx/include/netinet/ether.h +++ b/nuttx/include/netinet/ether.h @@ -41,11 +41,11 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + #include <net/ethernet.h> /**************************************************************************** - * Public Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/include/netinet/in.h b/nuttx/include/netinet/in.h index 21765f7b5..9c38b229b 100644 --- a/nuttx/include/netinet/in.h +++ b/nuttx/include/netinet/in.h @@ -40,10 +40,13 @@ * Included Files ****************************************************************************/ +#include <nuttx/config.h> + +#include <sys/types.h> #include <stdint.h> /**************************************************************************** - * Public Macro Definitions + * Pre-processor Definitions ****************************************************************************/ /* Values for protocol argument to socket() */ @@ -79,7 +82,7 @@ /* IPv4 Internet address */ -typedef uint32 in_addr_t; +typedef uint32_t in_addr_t; struct in_addr { in_addr_t s_addr; /* Address (network byte order) */ |