summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-10-13 00:30:37 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-10-13 00:30:37 +0100
commit9c92484c911e0f3d401a0230c90c4bcf40b84c05 (patch)
tree4248cd1333a272bde1d21b598ea1108f186dd050 /include
parent9063eb601ef82bb5a43faf2cc07ab87af9fd8977 (diff)
parent574282f24812a9cfac7f120e08115b29362f44fa (diff)
downloadxine-lib-9c92484c911e0f3d401a0230c90c4bcf40b84c05.tar.gz
xine-lib-9c92484c911e0f3d401a0230c90c4bcf40b84c05.tar.bz2
Merge from 1.1.
--HG-- rename : src/xine-engine/buffer.h => include/xine/buffer.h
Diffstat (limited to 'include')
-rw-r--r--include/xine/buffer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xine/buffer.h b/include/xine/buffer.h
index 5d1889012..110bcf4b9 100644
--- a/include/xine/buffer.h
+++ b/include/xine/buffer.h
@@ -712,7 +712,7 @@ void _x_bmiheader_le2me( xine_bmiheader *bih ) XINE_PROTECTED;
/** Convert xine_waveformatex struct from little endian */
void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED;
-static inline _x_is_fourcc(void *ptr, void *tag) {
+static __inline int _x_is_fourcc(void *ptr, void *tag) {
return memcmp(ptr, tag, 4) == 0;
}