diff options
author | px4dev <px4@purgatory.org> | 2012-08-14 09:07:59 -0700 |
---|---|---|
committer | px4dev <px4@purgatory.org> | 2012-08-14 09:07:59 -0700 |
commit | 74980af6c94372e49619b905e9b1b4565930e68a (patch) | |
tree | d902ff890bb38f20c01ecd0cf0428e05d4f3ca2a /nuttx/include | |
parent | 34118c72ef88d33d0074914c9bf0cda0232e4940 (diff) | |
parent | 3cc812dbad530e36360a992da9bc4533c016d98d (diff) | |
download | px4-firmware-74980af6c94372e49619b905e9b1b4565930e68a.tar.gz px4-firmware-74980af6c94372e49619b905e9b1b4565930e68a.tar.bz2 px4-firmware-74980af6c94372e49619b905e9b1b4565930e68a.zip |
Merge branch 'NuttX/master' from git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5027 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/include')
-rw-r--r-- | nuttx/include/ctype.h | 2 | ||||
-rw-r--r-- | nuttx/include/netinet/arp.h | 19 | ||||
-rw-r--r-- | nuttx/include/nuttx/net/ioctl.h | 1 | ||||
-rw-r--r-- | nuttx/include/sys/types.h | 9 |
4 files changed, 19 insertions, 12 deletions
diff --git a/nuttx/include/ctype.h b/nuttx/include/ctype.h index 6959a44b1..22b325eef 100644 --- a/nuttx/include/ctype.h +++ b/nuttx/include/ctype.h @@ -72,7 +72,7 @@ * ****************************************************************************/ -#define isascii(c) ((c) >= 0 && (c) <= 0x7f); +#define isascii(c) ((c) >= 0 && (c) <= 0x7f) /**************************************************************************** * Name: isprint diff --git a/nuttx/include/netinet/arp.h b/nuttx/include/netinet/arp.h index 34cfc84a4..e318945aa 100644 --- a/nuttx/include/netinet/arp.h +++ b/nuttx/include/netinet/arp.h @@ -58,14 +58,17 @@ #define SIOCDARP _ARPIOC(2) /* Delete an ARP mapping */ #define SIOCGARP _ARPIOC(3) /* Get an ARP mapping */ -/* 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 */ +/* Definitions for bits in field arp_flags of struct arpreq. If the + * ATF_NETMASK flag is set, then arp_netmask should be valid. This should + * be set to 0xffffffff, or 0 to remove an existing arp entry. + */ + +#define ATF_COM (1 << 0) /* Lookup complete */ +#define ATF_PERM (1 << 1) /* Permanent entry */ +#define ATF_PUBL (1 << 2) /* Publish entry */ +#define ATF_USETRAILERS (1 << 3) /* Trailers requested (obsolete) */ +#define ATF_NETMASK (1 << 4) /* Use a netmask */ +#define ATF_DONTPUB (1 << 5) /* Don't answer */ /**************************************************************************** * Public Type Definitions diff --git a/nuttx/include/nuttx/net/ioctl.h b/nuttx/include/nuttx/net/ioctl.h index 5bce5eaf1..be3f597f4 100644 --- a/nuttx/include/nuttx/net/ioctl.h +++ b/nuttx/include/nuttx/net/ioctl.h @@ -149,6 +149,7 @@ /**************************************************************************** * Type Definitions ****************************************************************************/ +/* See include/net/if.h */ /**************************************************************************** * Public Function Prototypes diff --git a/nuttx/include/sys/types.h b/nuttx/include/sys/types.h index 6014b9b74..2ae69d4a7 100644 --- a/nuttx/include/sys/types.h +++ b/nuttx/include/sys/types.h @@ -1,7 +1,7 @@ /**************************************************************************** * include/sys/types.h * - * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -63,8 +63,11 @@ /* NULL is usually defined in stddef.h (which includes this file) */ #ifndef NULL - /* SDCC is sensitive to NULL pointer type conversions */ -# ifdef SDCC + /* SDCC is sensitive to NULL pointer type conversions, and C++ defines + * NULL as zero + */ + +# if defined(SDCC) || defined(__cplusplus) # define NULL (0) # else # define NULL ((void*)0) |