diff options
author | Marcoen Hirschberg <marcoen@gmail.com> | 2006-08-11 11:35:26 +0000 |
---|---|---|
committer | Marcoen Hirschberg <marcoen@gmail.com> | 2006-08-11 11:35:26 +0000 |
commit | ed70da26bd02ad50b9a7e4d1297cb4e7e43be6d4 (patch) | |
tree | 490c605b9feb1e0910c9109ce05411118a0d3d29 /apps/plugins/jpeg.c | |
parent | 3b52bb9c68665c6860c7da6f8ee0b3d8fe26d53d (diff) | |
download | rockbox-ed70da26bd02ad50b9a7e4d1297cb4e7e43be6d4.tar.gz rockbox-ed70da26bd02ad50b9a7e4d1297cb4e7e43be6d4.zip |
don't assign NULL to a long (fixes sim build warnings)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10526 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/jpeg.c')
-rw-r--r-- | apps/plugins/jpeg.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index 9a32a8c6ca..5e221fea98 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -2097,22 +2097,22 @@ int show_menu(void) /* return 1 to quit */ | |||
2097 | { "Return", NULL }, | 2097 | { "Return", NULL }, |
2098 | }; | 2098 | }; |
2099 | static const struct opt_items slideshow[2] = { | 2099 | static const struct opt_items slideshow[2] = { |
2100 | {"Disable",NULL}, | 2100 | {"Disable",0}, |
2101 | {"Enable",NULL}, | 2101 | {"Enable",0}, |
2102 | }; | 2102 | }; |
2103 | static const struct opt_items timeout[12] = { | 2103 | static const struct opt_items timeout[12] = { |
2104 | { "1 second", NULL }, | 2104 | { "1 second", 0 }, |
2105 | { "2 seconds", NULL }, | 2105 | { "2 seconds", 0 }, |
2106 | { "3 seconds", NULL }, | 2106 | { "3 seconds", 0 }, |
2107 | { "4 seconds", NULL }, | 2107 | { "4 seconds", 0 }, |
2108 | { "5 seconds", NULL }, | 2108 | { "5 seconds", 0 }, |
2109 | { "6 seconds", NULL }, | 2109 | { "6 seconds", 0 }, |
2110 | { "7 seconds", NULL }, | 2110 | { "7 seconds", 0 }, |
2111 | { "8 seconds", NULL }, | 2111 | { "8 seconds", 0 }, |
2112 | { "9 seconds", NULL }, | 2112 | { "9 seconds", 0 }, |
2113 | { "10 seconds", NULL }, | 2113 | { "10 seconds", 0 }, |
2114 | { "15 seconds", NULL }, | 2114 | { "15 seconds", 0 }, |
2115 | { "20 seconds", NULL }, | 2115 | { "20 seconds", 0 }, |
2116 | }; | 2116 | }; |
2117 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), | 2117 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), |
2118 | NULL, NULL, NULL, NULL); | 2118 | NULL, NULL, NULL, NULL); |