diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2021-03-07 18:11:13 -0500 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2021-03-07 23:12:41 +0000 |
| commit | bbd85cf0c1b3fb14d46216ed7a5bc79a70375567 (patch) | |
| tree | f1dc71188f210eb3c4a7a90ae88a08cd53cf335c | |
| parent | 9712d375ce31d8394cc30b9121577a7646c1af12 (diff) | |
| download | rockbox-bbd85cf0c1b3fb14d46216ed7a5bc79a70375567.tar.gz rockbox-bbd85cf0c1b3fb14d46216ed7a5bc79a70375567.zip | |
settings: Fix inconsistent #ifdefs wrapping the usb_mode stuff
It should be:
#if defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR)
Change-Id: I49355d56834de3893a9a244793b39f662c27f136
| -rw-r--r-- | apps/menus/settings_menu.c | 2 | ||||
| -rw-r--r-- | apps/settings.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index f8dbb86dc3..a28b568da1 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
| @@ -449,7 +449,7 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | |||
| 449 | #if defined(DX50) || defined(DX90) | 449 | #if defined(DX50) || defined(DX90) |
| 450 | &governor, | 450 | &governor, |
| 451 | #endif | 451 | #endif |
| 452 | #ifdef HAVE_USB_POWER | 452 | #if defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR) |
| 453 | &usb_mode, | 453 | &usb_mode, |
| 454 | #endif | 454 | #endif |
| 455 | ); | 455 | ); |
diff --git a/apps/settings.h b/apps/settings.h index e6af373e15..728e10bf30 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
| @@ -824,7 +824,7 @@ struct user_settings | |||
| 824 | #if defined(DX50) || defined(DX90) | 824 | #if defined(DX50) || defined(DX90) |
| 825 | int governor; | 825 | int governor; |
| 826 | #endif | 826 | #endif |
| 827 | #ifdef HAVE_USB_POWER | 827 | #if defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR) |
| 828 | int usb_mode; | 828 | int usb_mode; |
| 829 | #endif | 829 | #endif |
| 830 | }; | 830 | }; |