iliaa Sun Dec 16 17:14:12 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/exif exif.c
Log:
Fixed bug #43606 (define missing depencies of the exif extension)
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.20.2.1&r2=1.173.2.5.2.20.2.2&diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173.2.5.2.20.2.1
php-src/ext/exif/exif.c:1.173.2.5.2.20.2.2
--- php-src/ext/exif/exif.c:1.173.2.5.2.20.2.1 Thu Sep 27 18:00:38 2007
+++ php-src/ext/exif/exif.c Sun Dec 16 17:14:11 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.173.2.5.2.20.2.1 2007/09/27 18:00:38 dmitry Exp $ */
+/* $Id: exif.c,v 1.173.2.5.2.20.2.2 2007/12/16 17:14:11 iliaa Exp $ */
/* ToDos
*
@@ -142,7 +142,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.20.2.1 2007/09/27 18:00:38
dmitry Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.20.2.2 2007/12/16 17:14:11
iliaa Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -241,12 +241,21 @@
}
/* }}} */
+/* {{{ exif dependencies */
+static const zend_module_dep exif_module_deps[] = {
+ ZEND_MOD_REQUIRED("standard")
+ #if EXIF_USE_MBSTRING
+ ZEND_MOD_REQUIRED("mbstring")
+ #endif
+ {NULL, NULL, NULL}
+};
+/* }}} */
+
/* {{{ exif_module_entry
*/
zend_module_entry exif_module_entry = {
-#if ZEND_MODULE_API_NO >= 20010901
- STANDARD_MODULE_HEADER,
-#endif
+ STANDARD_MODULE_HEADER_EX, NULL,
+ exif_module_deps,
"exif",
exif_functions,
PHP_MINIT(exif),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
