summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2004-09-09 09:08:33 +0000
committerMarcus Boerger <helly@php.net>2004-09-09 09:08:33 +0000
commit8e56b3b6a6fbd87a68630fa5703c8eb1394bc0ed (patch)
tree4c846323604dea678eb57f69aaf05a3a26d52177
parentb16ae3b73ae63e232dadde049113d88cebaa3011 (diff)
downloadphp-git-8e56b3b6a6fbd87a68630fa5703c8eb1394bc0ed.tar.gz
Proper #ifdef'ing
-rw-r--r--ext/ming/ming.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/ming/ming.c b/ext/ming/ming.c
index ca3a7d4272..9bad646777 100644
--- a/ext/ming/ming.c
+++ b/ext/ming/ming.c
@@ -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;