summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2006-09-02 19:11:00 +0000
committerDave Chapman <dave@dchapman.com>2006-09-02 19:11:00 +0000
commit1fe5fc935c8b1d39c82a75361bc7c6d34648f3e1 (patch)
tree339f4d3c186e2cb20d8bf30fb7ac26114b30f6ac
parent617b67e769661d4841b4fd1ace358b932f9c0378 (diff)
downloadrockbox-1fe5fc935c8b1d39c82a75361bc7c6d34648f3e1.tar.gz
rockbox-1fe5fc935c8b1d39c82a75361bc7c6d34648f3e1.zip
#include button.h in settings.h - HAVE_BUTTON_HOLD (defined in button.h) is used in the definition of the settings structure - meaning different settings structures were being used depending on whether the .c file included button.h before settings.h or not. Thanks to David Rothenberger for spotting.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10857 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/settings.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/settings.h b/apps/settings.h
index e4787f53a6..05f5dee382 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -27,6 +27,7 @@
27#include "dircache.h" 27#include "dircache.h"
28#include "timefuncs.h" 28#include "timefuncs.h"
29#include "tagcache.h" 29#include "tagcache.h"
30#include "button.h"
30 31
31#ifdef HAVE_BACKLIGHT_BRIGHTNESS 32#ifdef HAVE_BACKLIGHT_BRIGHTNESS
32#include "backlight.h" /* for [MIN|MAX]_BRIGHTNESS_SETTING */ 33#include "backlight.h" /* for [MIN|MAX]_BRIGHTNESS_SETTING */