summaryrefslogtreecommitdiffstats
path: root/uisimulator
diff options
context:
space:
mode:
authorMichael Chicoine <mc2739@gmail.com>2009-11-23 17:43:42 +0000
committerMichael Chicoine <mc2739@gmail.com>2009-11-23 17:43:42 +0000
commitae22ef13edf317137504770aadac429df3b0d53f (patch)
treee8cef9af2c5f2c236afe2d21848517d383a33669 /uisimulator
parent8ceb030b8ede18b687e1da17a6f5ce169482f07e (diff)
downloadrockbox-ae22ef13edf317137504770aadac429df3b0d53f.tar.gz
rockbox-ae22ef13edf317137504770aadac429df3b0d53f.tar.bz2
rockbox-ae22ef13edf317137504770aadac429df3b0d53f.zip
UISimulator - prevent multiple definition of usb_inserted when USB_NONE is defined
This fixes simulator build errors on mini2440 git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23723 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
-rw-r--r--uisimulator/common/stubs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c
index 2218c497f8..d1ec4ec6c2 100644
--- a/uisimulator/common/stubs.c
+++ b/uisimulator/common/stubs.c
@@ -250,10 +250,12 @@ bool charging_state(void)
}
#endif /* CONFIG_CHARGING */
+#ifndef USB_NONE
bool usb_inserted(void)
{
return false;
}
+#endif
#ifdef HAVE_REMOTE_LCD_TICKING
void lcd_remote_emireduce(bool state)