edink Wed Feb 16 04:53:33 2005 EDT
Modified files:
/php-src/ext/exif exif.c
Log:
Enable mbstring use on windows. We were linking against mbstring for
some time now, but have never actually used it on Windows.
Fixes #31980.
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.167&r2=1.168&ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.167 php-src/ext/exif/exif.c:1.168
--- php-src/ext/exif/exif.c:1.167 Tue Feb 15 16:56:17 2005
+++ php-src/ext/exif/exif.c Wed Feb 16 04:53:26 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.167 2005/02/15 21:56:17 iliaa Exp $ */
+/* $Id: exif.c,v 1.168 2005/02/16 09:53:26 edink Exp $ */
/* ToDos
*
@@ -66,7 +66,7 @@
#include "ext/standard/php_image.h"
#include "ext/standard/info.h"
-#if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING)
+#if PHP_WIN32 ||(HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING))
#define EXIF_USE_MBSTRING 1
#else
#define EXIF_USE_MBSTRING 0
@@ -112,7 +112,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.167 2005/02/15 21:56:17 iliaa Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.168 2005/02/16 09:53:26 edink Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
