From 6ce81902d5ad2f7584f47193caf31c009937af17 Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Mon, 3 Oct 2005 12:37:55 +0000 Subject: [PATCH 1/1] OS/X gcc/g++ 4.x fix git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt++@845 d19143bc-622f-0410-bfdd-b5b2a6649095 --- mlt++/src/MltProperties.cpp | 2 +- mlt++/src/MltProperties.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mlt++/src/MltProperties.cpp b/mlt++/src/MltProperties.cpp index e6ebfa6..a1452e2 100644 --- a/mlt++/src/MltProperties.cpp +++ b/mlt++/src/MltProperties.cpp @@ -220,7 +220,7 @@ int Properties::save( const char *file ) return error; } -#ifdef __DARWIN__ +#if defined( __DARWIN__ ) && GCC_VERSION < 40000 Event *Properties::listen( char *id, void *object, void (*listener)( ... ) ) { diff --git a/mlt++/src/MltProperties.h b/mlt++/src/MltProperties.h index ab66ecd..9393992 100644 --- a/mlt++/src/MltProperties.h +++ b/mlt++/src/MltProperties.h @@ -73,8 +73,8 @@ namespace Mlt void debug( const char *title = "Object", FILE *output = stderr ); void load( const char *file ); int save( const char *file ); - #ifdef __DARWIN__ - Event *listen( char *id, void *object, void (*)(...) ); + #if defined( __DARWIN__ ) && GCC_VERSION < 40000 + Event *listen( char *id, void *object, void (*)( ... ) ); #else Event *listen( char *id, void *object, mlt_listener ); #endif -- 1.7.4.4