From b50585d9682a132848c9f6d040c3bd1c9d6fcafc Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Mon, 3 Oct 2005 12:36:47 +0000 Subject: [PATCH 1/1] gcc/g++ 4.x fix git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@844 d19143bc-622f-0410-bfdd-b5b2a6649095 --- src/framework/mlt_events.h | 5 +++++ src/framework/mlt_types.h | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/framework/mlt_events.h b/src/framework/mlt_events.h index 7045771..e158208 100644 --- 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 dfda74f..f710055 100644 --- 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 #include "mlt_pool.h" -- 1.7.4.4