diff options
| author | Tectu <joel@unormal.org> | 2012-12-16 08:58:59 -0800 |
|---|---|---|
| committer | Tectu <joel@unormal.org> | 2012-12-16 08:58:59 -0800 |
| commit | 4743790cd40832205f701a280acd622cd003a9fd (patch) | |
| tree | 088919aae5e2673621f6090dc79adac862c8c8a6 /src/ginput/keyboard.c | |
| parent | 09fc35864aa695cc46dcb95ed3951a365622b709 (diff) | |
| parent | f31a1f7f4aeb09bc09d49944daaf2f38fddd94e7 (diff) | |
| download | uGFX-4743790cd40832205f701a280acd622cd003a9fd.tar.gz uGFX-4743790cd40832205f701a280acd622cd003a9fd.tar.bz2 uGFX-4743790cd40832205f701a280acd622cd003a9fd.zip | |
Merge pull request #26 from inmarket/master
Many tidyups and restructure.
Diffstat (limited to 'src/ginput/keyboard.c')
| -rw-r--r-- | src/ginput/keyboard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ginput/keyboard.c b/src/ginput/keyboard.c index 1c38a408..bd443e77 100644 --- a/src/ginput/keyboard.c +++ b/src/ginput/keyboard.c @@ -27,9 +27,9 @@ */
#include "ch.h"
#include "hal.h"
-#include "ginput.h"
+#include "gfx.h"
-#if GINPUT_NEED_KEYBOARD || defined(__DOXYGEN__)
+#if (GFX_USE_GINPUT && GINPUT_NEED_KEYBOARD) || defined(__DOXYGEN__)
#error "GINPUT: GINPUT_NEED_KEYBOARD - Not Implemented Yet"
-#endif /* GINPUT_NEED_KEYBOARD */
+#endif /* GFX_USE_GINPUT && GINPUT_NEED_KEYBOARD */
/** @} */
|