From 2306014beea61aa49e2b99a8d4f70d82a6900baa Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Mon, 18 Aug 2008 18:27:55 +0100 Subject: Fix another compilation failure when using C++. --- ChangeLog | 1 + src/xine-engine/buffer.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5860d9766..422f4df17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ xine-lib (1.1.16) 2008-??-?? + * Fix reported compilation failures (with C++ programs). xine-lib (1.1.15) 2008-08-14 * Security fixes: diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index 1cf1f6361..9a30ea7e8 100644 --- a/src/xine-engine/buffer.h +++ b/src/xine-engine/buffer.h @@ -676,7 +676,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 int _x_is_fourcc(void *ptr, void *tag) { +static __inline int _x_is_fourcc(void *ptr, void *tag) { return memcmp(ptr, tag, 4) == 0; } -- cgit v1.2.3