commit ae22ef13edf317137504770aadac429df3b0d53f
author Michael Chicoine <mc2739@gmail.com> Mon Nov 23 17:43:42 2009 +0000
committer Michael Chicoine <mc2739@gmail.com> Mon Nov 23 17:43:42 2009 +0000
tree e8cef9af2c5f2c236afe2d21848517d383a33669
parent 8ceb030b8ede18b687e1da17a6f5ce169482f07e

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

uisimulator/common/stubs.c

diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c
index 2218c49..d1ec4ec 100644
--- a/uisimulator/common/stubs.c
+++ b/uisimulator/common/stubs.c
@@ -250,10 +250,12 @@
 }
 #endif /* CONFIG_CHARGING */
 
+#ifndef USB_NONE
 bool usb_inserted(void)
 {
     return false;
 }
+#endif
 
 #ifdef HAVE_REMOTE_LCD_TICKING
 void lcd_remote_emireduce(bool state)