Replace references to HAVE_RTC with CONFIG_RTC and remove the HAVE_RTC defines from config-*.h

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8147 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 9 insertions, 9 deletions

diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index d336d8ad0e..fda54a610e 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -112,9 +112,9 @@ void gui_statusbar_init(struct gui_statusbar * bar)
 void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
 {
     struct screen * display = bar->display;
-#ifdef HAVE_RTC
+#ifdef CONFIG_RTC
     struct tm* tm; /* For Time */
-#endif /* HAVE_RTC */
+#endif /* CONFIG_RTC */
 
 #ifdef HAVE_LCD_CHARCELLS
     (void)force_redraw; /* players always "redraw" */
@@ -126,11 +126,11 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
     bar->info.battery_safe = battery_level_safe();
 
 #ifdef HAVE_LCD_BITMAP
-#ifdef HAVE_RTC
+#ifdef CONFIG_RTC
     tm = get_time();
     bar->info.hour = tm->tm_hour;
     bar->info.minute = tm->tm_min;
-#endif /* HAVE_RTC */
+#endif /* CONFIG_RTC */
 
     bar->info.shuffle = global_settings.playlist_shuffle;
 #ifdef HAS_BUTTON_HOLD
@@ -257,9 +257,9 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
         if (bar->info.keylockremote)
             gui_statusbar_icon_lock_remote(display);
 #endif
-#ifdef HAVE_RTC
+#ifdef CONFIG_RTC
         gui_statusbar_time(display, bar->info.hour, bar->info.minute);
-#endif /* HAVE_RTC */
+#endif /* CONFIG_RTC */
 #if (CONFIG_LED == LED_VIRTUAL) || defined(HAVE_REMOTE_LCD)
         if(!display->has_disk_led && bar->info.led)
             gui_statusbar_led(display);
@@ -482,7 +482,7 @@ void gui_statusbar_led(struct screen * display)
 }
 #endif
 
-#ifdef HAVE_RTC
+#ifdef CONFIG_RTC
 /*
  * Print time to status bar
  */
diff --git a/apps/gui/statusbar.h b/apps/gui/statusbar.h
index 62f6b90820..6b8e49a838 100644
--- a/apps/gui/statusbar.h
+++ b/apps/gui/statusbar.h
@@ -32,7 +32,7 @@
 struct status_info {
     int battlevel;
     int volume;
-#ifdef HAVE_RTC
+#ifdef CONFIG_RTC
     int hour;
     int minute;
 #endif
@@ -111,7 +111,7 @@ void gui_statusbar_icon_lock_remote(struct screen * display);
 void gui_statusbar_led(struct screen * display);
 
 
-#ifdef HAVE_RTC
+#ifdef CONFIG_RTC
 void gui_statusbar_time(struct screen * display, int hour, int minute);
 #endif