tree 7916d166058a
parent 1cb8085922eb
author Darren Salt <linux@youmustbejoking.demon.co.uk> 1218967411 -3600
committer Darren Salt <linux@youmustbejoking.demon.co.uk> 1218967411 -3600
revision 9552
branch default

Fix a compilation failure when using C++.
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -676,7 +676,7 @@
 /* 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;
 }
 
tree 2709fe49f09c
parent c35bdd51ce1c
author Darren Salt <linux@youmustbejoking.demon.co.uk> 1219080475 -3600
committer Darren Salt <linux@youmustbejoking.demon.co.uk> 1219080475 -3600
revision 9553
branch default

Fix another compilation failure when using C++.
diff --git a/ChangeLog b/ChangeLog
--- 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
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -676,7 +676,7 @@
 /* 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;
 }