moriyoshi Sun Oct 6 11:42:23 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/mbstring mbfilter.c
Log:
merging
Index: php4/ext/mbstring/mbfilter.c
diff -u php4/ext/mbstring/mbfilter.c:1.42 php4/ext/mbstring/mbfilter.c:1.42.2.1
--- php4/ext/mbstring/mbfilter.c:1.42 Tue Aug 27 11:32:03 2002
+++ php4/ext/mbstring/mbfilter.c Sun Oct 6 11:42:22 2002
@@ -79,7 +79,7 @@
*
*/
-/* $Id: mbfilter.c,v 1.42 2002/08/27 15:32:03 helly Exp $ */
+/* $Id: mbfilter.c,v 1.42.2.1 2002/10/06 15:42:22 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -89,6 +89,8 @@
#include "php.h"
#include "php_globals.h"
+#ifdef HAVE_MBSTRING
+
#include <stdlib.h>
#include "mbfilter.h"
@@ -9556,6 +9558,8 @@
return result;
}
+
+#endif /* HAVE_MBSTRING */
/*
* Local variables:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
