gcc/g++ 4.x fix

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@844 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/framework/mlt_events.h b/src/framework/mlt_events.h
index 70457712817efdcf6eb46b52c1d52f2eebdd968b..e1582084e2f3f81eb7c27c6043bf7471c33aa177 100644 (file)
--- a/src/framework/mlt_events.h
+++ b/src/framework/mlt_events.h
@@ -23,8 +23,13 @@
 
 #include "mlt_types.h"
 
+#if GCC_VERSION >= 40000
+typedef void ( *mlt_transmitter )( void *, ... );
+typedef void ( *mlt_listener )( void *, ... );
+#else
 typedef void ( *mlt_transmitter )( );
 typedef void ( *mlt_listener )( );
+#endif
 
 extern void mlt_events_init( mlt_properties self );
 extern int mlt_events_register( mlt_properties self, char *id, mlt_transmitter transmitter );

diff --git a/src/framework/mlt_types.h b/src/framework/mlt_types.h
index dfda74f745dcc85330040a5d5cb989d21a13afaf..f7100555d7b1fd54d6bafe9f8246830f73b26fab 100644 (file)
--- a/src/framework/mlt_types.h
+++ b/src/framework/mlt_types.h
@@ -21,6 +21,10 @@
 #ifndef _MLT_TYPES_H_
 #define _MLT_TYPES_H_
 
+#ifndef GCC_VERSION
+#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+#endif
+
 #include <stdint.h>
 
 #include "mlt_pool.h"