cvs: php-src(PHP_5_1) /ext/ming config.m4 ming.c

From: Date: Thu, 24 Nov 2005 00:51:46 +0000
Subject: cvs: php-src(PHP_5_1) /ext/ming config.m4 ming.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-35348@lists.php.net to get a copy of this message
helly Wed Nov 23 19:51:46 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/ming config.m4 ming.c Log: - Fix build for new ming versions # Maybe we should check if it is safe to MFH all the corresponding changes # in head. But why is this out of sync anyway? http://cvs.php.net/diff.php/php-src/ext/ming/config.m4?r1=1.22.2.2&r2=1.22.2.3&ty=u Index: php-src/ext/ming/config.m4 diff -u php-src/ext/ming/config.m4:1.22.2.2 php-src/ext/ming/config.m4:1.22.2.3 --- php-src/ext/ming/config.m4:1.22.2.2 Fri Aug 26 11:35:39 2005 +++ php-src/ext/ming/config.m4 Wed Nov 23 19:51:42 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.22.2.2 2005/08/26 15:35:39 helly Exp $ +dnl $Id: config.m4,v 1.22.2.3 2005/11/24 00:51:42 helly Exp $ dnl PHP_ARG_WITH(ming, for MING support, @@ -72,6 +72,13 @@ AC_DEFINE(HAVE_NEW_MING, 1, [ ]) dnl FIXME: This is now unconditional..better check coming later. AC_DEFINE(HAVE_MING_ZLIB, 1, [ ]) + AC_TRY_COMPILE([ +#include <ming.h> +int main(int,void) { + SWFMovie_output(NULL, NULL, NULL, 0)); + return 0; +} + ], [ AC_DEFINE(HAVE_MING_MOVIE_LEVEL, 1, []) ]) ]) CPPFLAGS=$old_CPPFLAGS http://cvs.php.net/diff.php/php-src/ext/ming/ming.c?r1=1.79.2.1&r2=1.79.2.2&ty=u Index: php-src/ext/ming/ming.c diff -u php-src/ext/ming/ming.c:1.79.2.1 php-src/ext/ming/ming.c:1.79.2.2 --- php-src/ext/ming/ming.c:1.79.2.1 Wed Aug 10 23:54:04 2005 +++ php-src/ext/ming/ming.c Wed Nov 23 19:51:42 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ming.c,v 1.79.2.1 2005/08/11 03:54:04 fmk Exp $ */ +/* $Id: ming.c,v 1.79.2.2 2005/11/24 00:51:42 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2244,7 +2244,7 @@ Ming_setSWFCompression(oldval); } RETURN_LONG(out); -#elif defined(HAVE_NEW_MING) +#elif defined(HAVE_NEW_MING) && defined(HAVE_MING_MOVIE_LEVEL) zval **zlimit = NULL; int limit = -1; int argc = ZEND_NUM_ARGS(); @@ -2323,7 +2323,7 @@ if (oldval >= -1 && oldval <=9) Ming_setSWFCompression(oldval); RETURN_LONG(out); -#elif defined(HAVE_NEW_MING) +#elif defined(HAVE_NEW_MING) && defined(HAVE_MING_MOVIE_LEVEL) RETURN_LONG(SWFMovie_output(movie, &phpStreamOutputMethod, what, limit)); #else RETURN_LONG(SWFMovie_output(movie, &phpStreamOutputMethod, what)); @@ -2374,7 +2374,7 @@ if (Z_TYPE_PP(x) == IS_RESOURCE) { ZEND_FETCH_RESOURCE(stream, php_stream *, x, -1,"File-Handle",php_file_le_stream()); -#if defined(HAVE_NEW_MING) +#if defined(HAVE_NEW_MING) && defined(HAVE_MING_MOVIE_LEVEL) RETURN_LONG(SWFMovie_output(getMovie(getThis() TSRMLS_CC), &phpStreamOutputMethod, stream, limit)); #else RETVAL_LONG(SWFMovie_output(getMovie(getThis() TSRMLS_CC), &phpStreamOutputMethod, stream)); @@ -2393,7 +2393,7 @@ RETURN_FALSE; } -#if defined(HAVE_NEW_MING) +#if defined(HAVE_NEW_MING) && defined(HAVE_MING_MOVIE_LEVEL) retval = SWFMovie_output(getMovie(getThis() TSRMLS_CC), &phpStreamOutputMethod, (void *)stream, limit); #else retval = SWFMovie_output(getMovie(getThis() TSRMLS_CC), &phpStreamOutputMethod, (void *)stream);

« previous php.cvs (#35348) next »