summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2010-05-21 14:01:22 +0000
committerMichael Sevakis <jethead71@rockbox.org>2010-05-21 14:01:22 +0000
commitd7244926f5946a3b8ac2ef83953d0e423b2def2a (patch)
tree432afc3ff332e7ceb31090aff30edb3ba453f156
parent0ac61bffa799ed4817ffd1079617ef6ac933a3f2 (diff)
downloadrockbox-d7244926f5946a3b8ac2ef83953d0e423b2def2a.tar.gz
rockbox-d7244926f5946a3b8ac2ef83953d0e423b2def2a.tar.bz2
rockbox-d7244926f5946a3b8ac2ef83953d0e423b2def2a.zip
mpegplayer: use OFF_T_MIN/MAX instead of LONG_MIN/MAX in one spot. Define OFF_T_MIN as well if not already defined.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26232 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/mpegplayer/disk_buf.h4
-rw-r--r--apps/plugins/mpegplayer/mpeg_parser.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/apps/plugins/mpegplayer/disk_buf.h b/apps/plugins/mpegplayer/disk_buf.h
index 5be88f195a..bc76ab6dc3 100644
--- a/apps/plugins/mpegplayer/disk_buf.h
+++ b/apps/plugins/mpegplayer/disk_buf.h
@@ -27,6 +27,10 @@
#define OFF_T_MAX (~((off_t)1 << (sizeof (off_t)*8 - 1)))
#endif
+#ifndef OFF_T_MIN
+#define OFF_T_MIN ((off_t)1 << (sizeof (off_t)*8 - 1))
+#endif
+
#define DISK_BUF_PAGE_SHIFT 15 /* 32KB cache lines */
#define DISK_BUF_PAGE_SIZE (1 << DISK_BUF_PAGE_SHIFT)
#define DISK_BUF_PAGE_MASK (DISK_BUF_PAGE_SIZE-1)
diff --git a/apps/plugins/mpegplayer/mpeg_parser.c b/apps/plugins/mpegplayer/mpeg_parser.c
index 06fa01c2e9..6883916149 100644
--- a/apps/plugins/mpegplayer/mpeg_parser.c
+++ b/apps/plugins/mpegplayer/mpeg_parser.c
@@ -60,8 +60,8 @@ void str_end_of_stream(struct stream *str)
* its behalf. Set right to the min first so a thread reading the
* overall window gets doesn't see this as valid no matter what the
* file length. */
- str->hdr.win_right = LONG_MIN;
- str->hdr.win_left = LONG_MAX;
+ str->hdr.win_right = OFF_T_MIN;
+ str->hdr.win_left = OFF_T_MAX;
/* No packets */
str->curr_packet = str->curr_packet_end = NULL;
/* No flags */