cvs: php-src /ext/ming ming.c

helly Thu Sep 9 05:08:38 2004 EDT Modified files: /php-src/ext/ming ming.c Log: Proper #ifdef'ing http://cvs.php.net/diff.php/php-src/ext/ming/ming.c?r1=1.72&r2=1.73&ty=u Index: php-src/ext/ming/ming.c diff -u php-src/ext/ming/ming.c:1.72 php-src/ext/ming/ming.c:1.73 --- php-src/ext/ming/ming.c:1.72 Tue Sep 7 15:40:17 2004 +++ php-src/ext/ming/ming.c Thu Sep 9 05:08:32 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ming.c,v 1.72 2004/09/07 19:40:17 fmk Exp $ */ +/* $Id: ming.c,v 1.73 2004/09/09 09:08:32 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -238,14 +238,16 @@ return (SWFCharacter)getBitmap(id TSRMLS_CC); else if(Z_OBJCE_P(id) == sound_class_entry_ptr) return (SWFCharacter)getSound(id TSRMLS_CC); - else if(Z_OBJCE_P(id) == videostream_class_entry_ptr) - return (SWFCharacter)getVideoStream(id TSRMLS_CC); - else if(Z_OBJCE_P(id) == prebuiltclip_class_entry_ptr) - return (SWFCharacter)getPrebuiltClip(id TSRMLS_CC); +#ifdef HAVE_NEW_MING /* else if(Z_OBJCE_P(id) == soundinstance_class_entry_ptr) return (SWFCharacter)getSoundInstance(id TSRMLS_CC); */ + else if(Z_OBJCE_P(id) == videostream_class_entry_ptr) + return (SWFCharacter)getVideoStream(id TSRMLS_CC); + else if(Z_OBJCE_P(id) == prebuiltclip_class_entry_ptr) + return (SWFCharacter)getPrebuiltClip(id TSRMLS_CC); +#endif else php_error_docref(NULL TSRMLS_CC, E_ERROR, "Called object is not an SWFCharacter"); return NULL;