Mercurial > mplayer.hg

changeset 30649:77cc0ca2c757

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Declare stream_fill_buffer() and stream_seek_long() unconditionally. They are public functions that are unconditionally compiled, so they should not be declared conditionally.
author diego
date Sun, 21 Feb 2010 23:30:34 +0000
parents 74d39bc2b2c4
children 6fc02905e992
files stream/stream.h
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/stream/stream.h	Sun Feb 21 23:26:16 2010 +0000
+++ b/stream/stream.h	Sun Feb 21 23:30:34 2010 +0000
@@ -142,14 +142,15 @@
   unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE];
 } stream_t;
 
+int stream_fill_buffer(stream_t *s);
+int stream_seek_long(stream_t *s, off_t pos);
+
 #ifdef CONFIG_STREAM_CACHE
 int stream_enable_cache(stream_t *stream,int size,int min,int prefill);
 int cache_stream_fill_buffer(stream_t *s);
 int cache_stream_seek_long(stream_t *s,off_t pos);
 #else
 // no cache, define wrappers:
-int stream_fill_buffer(stream_t *s);
-int stream_seek_long(stream_t *s,off_t pos);
 #define cache_stream_fill_buffer(x) stream_fill_buffer(x)
 #define cache_stream_seek_long(x,y) stream_seek_long(x,y)
 #define stream_enable_cache(x,y,z,w) 1