diff options
| author | Andrew Hannam <andrewh@inmarket.com.au> | 2012-11-29 06:13:43 -0800 |
|---|---|---|
| committer | Andrew Hannam <andrewh@inmarket.com.au> | 2012-11-29 06:13:43 -0800 |
| commit | f91aeb4c4d026056d4e8515f8e060097f41d216c (patch) | |
| tree | f5ade7a4ef2a5e4379990b2a56e00cea1b2827b2 /src | |
| parent | 8275c8820f230342939a2410dd0b24c0f26a14e5 (diff) | |
| parent | 5bfa0f26220588359342d4bf14add6dc53b4788b (diff) | |
| download | uGFX-f91aeb4c4d026056d4e8515f8e060097f41d216c.tar.gz uGFX-f91aeb4c4d026056d4e8515f8e060097f41d216c.tar.bz2 uGFX-f91aeb4c4d026056d4e8515f8e060097f41d216c.zip | |
Merge pull request #9 from Tectu/master
Merge Tectu Changes
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtimer.c | 2 | ||||
| -rw-r--r-- | src/gwin/button.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gtimer.c b/src/gtimer.c index 8956a190..164822f3 100644 --- a/src/gtimer.c +++ b/src/gtimer.c @@ -258,6 +258,8 @@ void gtimerStop(GTimer *pt) { *
* @param[in] pt Pointer to a GTimer structure
*
+ * @return TRUE if active, FALSE otherwise
+ *
* @api
*/
bool_t gtimerIsActive(GTimer *pt) {
diff --git a/src/gwin/button.c b/src/gwin/button.c index f62a86a4..fce82a20 100644 --- a/src/gwin/button.c +++ b/src/gwin/button.c @@ -30,12 +30,12 @@ #include "gwin.h"
#include "ginput.h"
-#if !defined(GFX_USE_GINPUT) || !GFX_USE_GINPUT
+#if (GFX_USE_GWIN && GWIN_NEED_BUTTON) || defined(__DOXYGEN__)
+
+#if !GFX_USE_GINPUT
#error "GWIN Buttons require GFX_USE_GINPUT"
#endif
-#if (GFX_USE_GWIN && GWIN_NEED_BUTTON) || defined(__DOXYGEN__)
-
#include <string.h>
#include "gwin_internal.h"
|