summaryrefslogtreecommitdiff
path: root/apps/plugins/zxbox/spmain.c
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2007-05-19 19:13:56 +0000
committerJens Arnold <amiconn@rockbox.org>2007-05-19 19:13:56 +0000
commit52986fb79ea70f09fff8000d13dc56b8e1e237d4 (patch)
treed78254d88cb558bc8b5a1826d3b4c367c2d44578 /apps/plugins/zxbox/spmain.c
parenta352c62ad0cb16eaae104b713c89b21491e3706a (diff)
downloadrockbox-52986fb79ea70f09fff8000d13dc56b8e1e237d4.tar.gz
rockbox-52986fb79ea70f09fff8000d13dc56b8e1e237d4.zip
Fix name collision on misc.h between zxbox and core.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13420 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/zxbox/spmain.c')
-rw-r--r--apps/plugins/zxbox/spmain.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/plugins/zxbox/spmain.c b/apps/plugins/zxbox/spmain.c
index b153b4191f..3f0bc9319e 100644
--- a/apps/plugins/zxbox/spmain.c
+++ b/apps/plugins/zxbox/spmain.c
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (C) 1996-1998 Szeredi Miklos 2 * Copyright (C) 1996-1998 Szeredi Miklos
3 * Email: mszeredi@inf.bme.hu 3 * Email: mszeredi@inf.bme.hu
4 * 4 *
@@ -17,7 +17,7 @@
17 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 17 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18 * 18 *
19 */ 19 */
20#include "misc.h" 20#include "zxmisc.h"
21#include "zxconfig.h" 21#include "zxconfig.h"
22#include "lib/configfile.h" 22#include "lib/configfile.h"
23#include "lib/oldmenuapi.h" 23#include "lib/oldmenuapi.h"
@@ -361,7 +361,7 @@ static bool zxbox_menu(void)
361 { "Options", NULL }, 361 { "Options", NULL },
362 { "Quit", NULL }, 362 { "Quit", NULL },
363 }; 363 };
364 364
365 m = menu_init(rb,items, sizeof(items) / sizeof(*items), 365 m = menu_init(rb,items, sizeof(items) / sizeof(*items),
366 NULL, NULL, NULL, NULL); 366 NULL, NULL, NULL, NULL);
367 367