From cc781990510e532b9b99d87d87d23caa99f13b1b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 8 Nov 2013 15:15:53 +0100 Subject: [PATCH] (Menu) Cut down on some HAVE_RMENU ifdefs --- driver.h | 2 +- frontend/menu/menu_common.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/driver.h b/driver.h index 484661bdd9..8ac160fc3f 100644 --- a/driver.h +++ b/driver.h @@ -387,7 +387,7 @@ typedef struct video_driver void (*free)(void *data); const char *ident; -#if defined(HAVE_RMENU) || defined(HAVE_RGUI) || defined(HAVE_RMENU_XUI) +#ifdef HAVE_MENU void (*restart)(void); #endif diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h index 9c5f2fa2b9..665c8930d0 100644 --- a/frontend/menu/menu_common.h +++ b/frontend/menu/menu_common.h @@ -337,9 +337,7 @@ void menu_init(void); bool menu_iterate(void); void menu_free(void); -#if defined(HAVE_RMENU) -int rmenu_iterate(void *data, unsigned action); -#elif defined(HAVE_RMENU_XUI) +#if defined(HAVE_RMENU_XUI) int rmenu_xui_iterate(void *data, unsigned action); #endif