diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-17 19:24:18 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-17 19:24:18 +0000 |
commit | 85dfa4b381788b2e3085fb94e7717087c5cac52c (patch) | |
tree | 415d0b50614a861512888c8f817e32fb4c7ad657 /nuttx/graphics | |
parent | 4304032f04cf5cfac5b10f69b4139111bcebb4d1 (diff) | |
download | px4-nuttx-85dfa4b381788b2e3085fb94e7717087c5cac52c.tar.gz px4-nuttx-85dfa4b381788b2e3085fb94e7717087c5cac52c.tar.bz2 px4-nuttx-85dfa4b381788b2e3085fb94e7717087c5cac52c.zip |
Fixes for clean NX compile/link
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2374 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/graphics')
-rw-r--r-- | nuttx/graphics/nxbe/nxbe_fbconfigure.c | 1 | ||||
-rw-r--r-- | nuttx/graphics/nxbe/nxbe_lower.c | 1 | ||||
-rw-r--r-- | nuttx/graphics/nxfonts/nxfonts_convert.c | 3 | ||||
-rw-r--r-- | nuttx/graphics/nxfonts/nxfonts_getfont.c | 5 | ||||
-rw-r--r-- | nuttx/graphics/nxsu/nx_kbdchin.c | 1 | ||||
-rw-r--r-- | nuttx/graphics/nxsu/nx_kbdin.c | 1 | ||||
-rw-r--r-- | nuttx/graphics/nxsu/nx_mousein.c | 1 |
7 files changed, 10 insertions, 3 deletions
diff --git a/nuttx/graphics/nxbe/nxbe_fbconfigure.c b/nuttx/graphics/nxbe/nxbe_fbconfigure.c index fb3e51f6c..df6dbe0d9 100644 --- a/nuttx/graphics/nxbe/nxbe_fbconfigure.c +++ b/nuttx/graphics/nxbe/nxbe_fbconfigure.c @@ -39,6 +39,7 @@ #include <nuttx/config.h> +#include <stddef.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxbe/nxbe_lower.c b/nuttx/graphics/nxbe/nxbe_lower.c index 334f50492..f2f160e83 100644 --- a/nuttx/graphics/nxbe/nxbe_lower.c +++ b/nuttx/graphics/nxbe/nxbe_lower.c @@ -39,6 +39,7 @@ #include <nuttx/config.h> +#include <stddef.h> #include <debug.h> #include <nuttx/nxglib.h> diff --git a/nuttx/graphics/nxfonts/nxfonts_convert.c b/nuttx/graphics/nxfonts/nxfonts_convert.c index 0599faa9b..ea8672c26 100644 --- a/nuttx/graphics/nxfonts/nxfonts_convert.c +++ b/nuttx/graphics/nxfonts/nxfonts_convert.c @@ -40,6 +40,7 @@ #include <nuttx/config.h> #include <stdint.h> +#include <stddef.h> #include <debug.h> #include <nuttx/nxglib.h> @@ -145,7 +146,7 @@ int NXF_FUNCNAME(nxf_convert,NXFONTS_SUFFIX) FAR NXF_PIXEL_T *dptr; FAR const uint8_t *sptr; uint8_t bmbyte; - uint8_t bmbit; + int bmbit; int row; int col; int bmndx; diff --git a/nuttx/graphics/nxfonts/nxfonts_getfont.c b/nuttx/graphics/nxfonts/nxfonts_getfont.c index 9fcc57155..3c53cae7f 100644 --- a/nuttx/graphics/nxfonts/nxfonts_getfont.c +++ b/nuttx/graphics/nxfonts/nxfonts_getfont.c @@ -40,6 +40,7 @@ #include <nuttx/config.h> #include <stdint.h> +#include <stddef.h> #include <debug.h> #include <nuttx/nxfonts.h> @@ -136,8 +137,8 @@ FAR const struct nx_font_s *nxf_getfontset(void) FAR const struct nx_fontbitmap_s *nxf_getbitmap(uint16_t ch) { - FAR const struct nx_fontset_s *set = nxf_getglyphset(ch); - FAR struct nx_fontbitmap_s *bm = NULL; + FAR const struct nx_fontset_s *set = nxf_getglyphset(ch); + FAR const struct nx_fontbitmap_s *bm = NULL; if (set) { diff --git a/nuttx/graphics/nxsu/nx_kbdchin.c b/nuttx/graphics/nxsu/nx_kbdchin.c index 03db76f48..51f4d8ce1 100644 --- a/nuttx/graphics/nxsu/nx_kbdchin.c +++ b/nuttx/graphics/nxsu/nx_kbdchin.c @@ -95,6 +95,7 @@ int nx_kbdchin(NXHANDLE handle, uint8_t ch) { wnd->cb->kbdin(wnd, 1, &ch, wnd->arg); } + return OK; } #endif /* CONFIG_NX_KBD */ diff --git a/nuttx/graphics/nxsu/nx_kbdin.c b/nuttx/graphics/nxsu/nx_kbdin.c index 4a1b93d09..066c31c8e 100644 --- a/nuttx/graphics/nxsu/nx_kbdin.c +++ b/nuttx/graphics/nxsu/nx_kbdin.c @@ -94,6 +94,7 @@ int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch) { wnd->cb->kbdin(wnd, nch, ch, wnd->arg); } + return OK; } #endif /* CONFIG_NX_KBD */ diff --git a/nuttx/graphics/nxsu/nx_mousein.c b/nuttx/graphics/nxsu/nx_mousein.c index d83da90b0..2d4c9bec9 100644 --- a/nuttx/graphics/nxsu/nx_mousein.c +++ b/nuttx/graphics/nxsu/nx_mousein.c @@ -194,6 +194,7 @@ int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons) } } } + return OK; } #endif /* CONFIG_NX_MOUSE */ |