]> granicus.if.org Git - php/commitdiff
Proper #ifdef'ing
authorMarcus Boerger <helly@php.net>
Thu, 9 Sep 2004 09:08:33 +0000 (09:08 +0000)
committerMarcus Boerger <helly@php.net>
Thu, 9 Sep 2004 09:08:33 +0000 (09:08 +0000)
ext/ming/ming.c

index ca3a7d4272091c97f34a2e1069992ad0827fb3cd..9bad646777de8b025b7a2dcc5ff8c118e77f7d84 100644 (file)
@@ -238,14 +238,16 @@ static SWFCharacter getCharacter(zval *id TSRMLS_DC)
                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;