diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-16 23:23:46 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-16 23:23:46 +0000 |
| commit | cef4fec60cb7f31f81f887fcfd729be41662abb1 (patch) | |
| tree | 0d46ddbbeaa56d21bde1660d97c4e34c31539f11 /nuttx/include | |
| parent | 471b50c5f8f0f49ce8abfb8f0085d05cfe32edaa (diff) | |
| download | px4-nuttx-cef4fec60cb7f31f81f887fcfd729be41662abb1.tar.gz px4-nuttx-cef4fec60cb7f31f81f887fcfd729be41662abb1.tar.bz2 px4-nuttx-cef4fec60cb7f31f81f887fcfd729be41662abb1.zip | |
Clean-up from big switch to stdint/stdbool
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2362 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/include')
| -rw-r--r-- | nuttx/include/errno.h | 4 | ||||
| -rw-r--r-- | nuttx/include/pthread.h | 2 | ||||
| -rwxr-xr-x | nuttx/include/stdint.h | 1 | ||||
| -rw-r--r-- | nuttx/include/sys/types.h | 14 |
4 files changed, 15 insertions, 6 deletions
diff --git a/nuttx/include/errno.h b/nuttx/include/errno.h index 945f83957..8c1654b0f 100644 --- a/nuttx/include/errno.h +++ b/nuttx/include/errno.h @@ -40,6 +40,8 @@ * Included Files ************************************************************************/ +#include <nuttx/compiler.h> + /************************************************************************ * Definitions ************************************************************************/ @@ -317,7 +319,7 @@ extern "C" { /* Return a pointer to the thread specifid errno */ -extern FAR int *get_errno_ptr(void); +EXTERN FAR int *get_errno_ptr(void); #undef EXTERN #if defined(__cplusplus) diff --git a/nuttx/include/pthread.h b/nuttx/include/pthread.h index c3342b369..c0cf9b75e 100644 --- a/nuttx/include/pthread.h +++ b/nuttx/include/pthread.h @@ -163,7 +163,7 @@ struct pthread_attr_s size_t stacksize; /* Size of the stack allocated for the pthead */ int16_t priority; /* Priority of the pthread */ uint8_t policy; /* Pthread scheduler policy */ - uint8_t nheritsched; /* Inherit parent prio/policy? */ + uint8_t inheritsched; /* Inherit parent prio/policy? */ }; typedef struct pthread_attr_s pthread_attr_t; diff --git a/nuttx/include/stdint.h b/nuttx/include/stdint.h index eece03496..3bd1d9f47 100755 --- a/nuttx/include/stdint.h +++ b/nuttx/include/stdint.h @@ -43,6 +43,7 @@ #include <nuttx/config.h> #include <nuttx/compiler.h> +#include <arch/types.h> #include <limits.h> /**************************************************************************** diff --git a/nuttx/include/sys/types.h b/nuttx/include/sys/types.h index 286cc3fe9..205beefff 100644 --- a/nuttx/include/sys/types.h +++ b/nuttx/include/sys/types.h @@ -43,16 +43,22 @@ #include <nuttx/config.h> #include <nuttx/compiler.h> -#include <stdint.h> +#ifndef __ASSEMBLY__ +# include <stdint.h> +#endif /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ -/* Alternative alues for type bool (for historic reasons) */ +/* Alternative values for type bool (for historic reasons) */ -#define TRUE 1 -#define FALSE 0 +#ifndef TRUE +# define TRUE 1 +#endif +#ifndef FALSE +# define FALSE 0 +#endif /* NULL is usually defined in stddef.h (which includes this file) */ |