diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-12-21 20:09:32 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-12-21 20:09:32 +0000 |
commit | c67fdb87f7f731d13050f752acf1c35e51766c05 (patch) | |
tree | a548cfe35af25a0d7b7b3a8a304784c334aecdb6 /nuttx/include | |
parent | 0f2decb70f505b108999fcdb80e89d7aae6760ce (diff) | |
download | px4-firmware-c67fdb87f7f731d13050f752acf1c35e51766c05.tar.gz px4-firmware-c67fdb87f7f731d13050f752acf1c35e51766c05.tar.bz2 px4-firmware-c67fdb87f7f731d13050f752acf1c35e51766c05.zip |
Patches from Petteri Aimonen (plus a few other things)
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5448 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/include')
-rw-r--r-- | nuttx/include/nuttx/nx/nxfonts.h | 6 | ||||
-rw-r--r-- | nuttx/include/pthread.h | 4 | ||||
-rw-r--r-- | nuttx/include/stdbool.h | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/nuttx/include/nuttx/nx/nxfonts.h b/nuttx/include/nuttx/nx/nxfonts.h index f1aecb9e5..8e7289b2a 100644 --- a/nuttx/include/nuttx/nx/nxfonts.h +++ b/nuttx/include/nuttx/nx/nxfonts.h @@ -125,6 +125,12 @@ enum nx_fontid_e { FONTID_DEFAULT = 0 /* The default font */ +/* Monospace fonts */ + +#ifdef CONFIG_NXFONT_MONO5X8 + , FONTID_MONO5X8 = 18 /* The 5x8 monospace font */ +#endif + /* Sans Serif fonts */ #ifdef CONFIG_NXFONT_SANS17X22 diff --git a/nuttx/include/pthread.h b/nuttx/include/pthread.h index 5a08f13b6..5066275b4 100644 --- a/nuttx/include/pthread.h +++ b/nuttx/include/pthread.h @@ -41,15 +41,15 @@ ********************************************************************************/ #include <nuttx/config.h> /* Default settings */ -#include <nuttx/compiler.h> /* Compiler settings */ +#include <nuttx/compiler.h> /* Compiler settings, noreturn_function */ #include <sys/types.h> /* Needed for general types */ #include <stdint.h> /* C99 fixed width integer types */ #include <stdbool.h> /* C99 boolean types */ +#include <unistd.h> /* For getpid */ #include <semaphore.h> /* Needed for sem_t */ #include <signal.h> /* Needed for sigset_t */ #include <time.h> /* Needed for struct timespec */ -#include <nuttx/compiler.h> /* For noreturn_function */ /******************************************************************************** * Compilation Switches diff --git a/nuttx/include/stdbool.h b/nuttx/include/stdbool.h index 9c16aee29..6c3302549 100644 --- a/nuttx/include/stdbool.h +++ b/nuttx/include/stdbool.h @@ -90,8 +90,8 @@ # define bool _Bool8 #endif -#define true 1 -#define false 0 +#define true (bool)1 +#define false (bool)0 #define __bool_true_false_are_defined 1 |