nlopess Sat Jan 6 19:25:31 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/ming config.m4 ming.c php_ming.h
Log:
fix build with libming 0.3 and older
http://cvs.php.net/viewvc.cgi/php-src/ext/ming/config.m4?r1=1.22.2.6.2.2&r2=1.22.2.6.2.3&diff_format=u
Index: php-src/ext/ming/config.m4
diff -u php-src/ext/ming/config.m4:1.22.2.6.2.2
php-src/ext/ming/config.m4:1.22.2.6.2.3
--- php-src/ext/ming/config.m4:1.22.2.6.2.2 Thu Nov 9 09:19:20 2006
+++ php-src/ext/ming/config.m4 Sat Jan 6 19:25:31 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.22.2.6.2.2 2006/11/09 09:19:20 fmk Exp $
+dnl $Id: config.m4,v 1.22.2.6.2.3 2007/01/06 19:25:31 nlopess Exp $
dnl
PHP_ARG_WITH(ming, for MING support,
@@ -41,6 +41,8 @@
PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$PHP_LIBDIR, MING_SHARED_LIBADD)
PHP_CHECK_LIBRARY(ming, SWFPrebuiltClip, [ AC_DEFINE(HAVE_SWFPREBUILTCLIP,
1, [ ]) ], [], [])
+ PHP_CHECK_LIBRARY(ming, SWFMovie_namedAnchor, [
AC_DEFINE(HAVE_SWFMOVIE_NAMEDANCHOR, 1, [ ]) ], [], [])
+ PHP_CHECK_LIBRARY(ming, Ming_setSWFCompression, [
AC_DEFINE(HAVE_MING_SETSWFCOMPRESSION, 1, [ ]) ], [], [])
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$MING_INC_DIR
http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.79.2.4.2.7&r2=1.79.2.4.2.8&diff_format=u
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.79.2.4.2.7
php-src/ext/ming/ming.c:1.79.2.4.2.8
--- php-src/ext/ming/ming.c:1.79.2.4.2.7 Mon Jan 1 09:36:03 2007
+++ php-src/ext/ming/ming.c Sat Jan 6 19:25:31 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ming.c,v 1.79.2.4.2.7 2007/01/01 09:36:03 sebastian Exp $ */
+/* $Id: ming.c,v 1.79.2.4.2.8 2007/01/06 19:25:31 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -52,6 +52,8 @@
PHP_FALIAS(ming_keypress, ming_keypress, NULL)
#ifdef HAVE_NEW_MING
PHP_FALIAS(ming_useconstants, ming_useConstants, NULL)
+#endif
+#ifdef HAVE_MING_SETSWFCOMPRESSION
PHP_FALIAS(ming_setswfcompression, ming_setSWFCompression, NULL)
#endif
{ NULL, NULL, NULL }
@@ -142,7 +144,9 @@
Ming_useConstants(Z_LVAL_PP(num));
}
/* }}} */
+#endif
+#ifdef HAVE_MING_SETSWFCOMPRESSION
/* {{{ set output compression */
PHP_FUNCTION(ming_setSWFCompression)
{
@@ -154,7 +158,6 @@
Ming_setSWFCompression(Z_LVAL_PP(num));
}
/* }}} */
-
#endif
static int le_swfmoviep;
@@ -2192,6 +2195,7 @@
}
/* }}} */
+#ifdef HAVE_SWFMOVIE_NAMEDANCHOR
/* {{{ proto void swfmovie::namedanchor(string name)
*/
PHP_METHOD(swfmovie, namedAnchor)
@@ -2207,6 +2211,7 @@
SWFMovie_namedAnchor(getMovie(getThis() TSRMLS_CC), Z_STRVAL_PP(name));
}
/* }}} */
+#endif
/* {{{ proto void swfmovie::protect([ string pasword])
*/
@@ -2786,9 +2791,11 @@
PHP_ME(swfmovie, importChar, NULL, 0)
PHP_ME(swfmovie, importFont, NULL, 0)
PHP_ME(swfmovie, addFont, NULL, 0)
- PHP_ME(swfmovie, namedAnchor, NULL, 0)
PHP_ME(swfmovie, protect, NULL, 0)
#endif
+#ifdef HAVE_SWFMOVIE_NAMEDANCHOR
+ PHP_ME(swfmovie, namedAnchor, NULL, 0)
+#endif
{ NULL, NULL, NULL }
};
http://cvs.php.net/viewvc.cgi/php-src/ext/ming/php_ming.h?r1=1.17.2.1.2.2&r2=1.17.2.1.2.3&diff_format=u
Index: php-src/ext/ming/php_ming.h
diff -u php-src/ext/ming/php_ming.h:1.17.2.1.2.2
php-src/ext/ming/php_ming.h:1.17.2.1.2.3
--- php-src/ext/ming/php_ming.h:1.17.2.1.2.2 Mon Jan 1 09:36:03 2007
+++ php-src/ext/ming/php_ming.h Sat Jan 6 19:25:31 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ming.h,v 1.17.2.1.2.2 2007/01/01 09:36:03 sebastian Exp $ */
+/* $Id: php_ming.h,v 1.17.2.1.2.3 2007/01/06 19:25:31 nlopess Exp $ */
#ifndef _PHP_MING_H
#define _PHP_MING_H
@@ -79,7 +79,9 @@
PHP_METHOD(swfmovie, remove);
PHP_METHOD(swfmovie, nextFrame);
PHP_METHOD(swfmovie, labelFrame);
+#ifdef HAVE_SWFMOVIE_NAMEDANCHOR
PHP_METHOD(swfmovie, namedAnchor);
+#endif
PHP_METHOD(swfmovie, setBackground);
PHP_METHOD(swfmovie, setRate);
PHP_METHOD(swfmovie, setDimension);
@@ -266,6 +268,8 @@
#ifdef HAVE_NEW_MING
PHP_FUNCTION(ming_useConstants);
+#endif
+#ifdef HAVE_MING_SETSWFCOMPRESSION
PHP_FUNCTION(ming_setSWFCompression);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
