hirokawa Mon Sep 22 22:42:48 2003 EDT
Modified files:
/php-src/ext/mbstring/libmbfl/filters html_entities.h
mbfilter_htmlent.c
mbfilter_htmlent.h
/php-src/ext/mbstring/libmbfl/mbfl mbfilter_8bit.h mbfilter_pass.h
mbfilter_wchar.h
mbfl_allocators.h
Log:
fixed win32-build and update e-mail address in mbstring.
Index: php-src/ext/mbstring/libmbfl/filters/html_entities.h
diff -u php-src/ext/mbstring/libmbfl/filters/html_entities.h:1.1
php-src/ext/mbstring/libmbfl/filters/html_entities.h:1.2
--- php-src/ext/mbstring/libmbfl/filters/html_entities.h:1.1 Sat Aug 23 02:18:36
2003
+++ php-src/ext/mbstring/libmbfl/filters/html_entities.h Mon Sep 22 22:42:46
2003
@@ -18,7 +18,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place,
* Suite 330, Boston, MA 02111-1307 USA
*
- * The author of this part: Marcus Boerger <[EMAIL PROTECTED]>
+ * The author of this part: Marcus Boerger <[EMAIL PROTECTED]>
*
*/
/*
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c
diff -u php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c:1.2
php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c:1.3
--- php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c:1.2 Wed Sep 17 01:42:56
2003
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c Mon Sep 22 22:42:46
2003
@@ -18,7 +18,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place,
* Suite 330, Boston, MA 02111-1307 USA
*
- * The author of this part: Marcus Boerger <[EMAIL PROTECTED]>
+ * The author of this part: Marcus Boerger <[EMAIL PROTECTED]>
*
*/
/*
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.h
diff -u php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.h:1.1
php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.h:1.2
--- php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.h:1.1 Sat Aug 23 02:18:36
2003
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.h Mon Sep 22 22:42:46
2003
@@ -18,7 +18,7 @@
* if not, write to the Free Software Foundation, Inc., 59 Temple Place,
* Suite 330, Boston, MA 02111-1307 USA
*
- * The author of this part: Marcus Boerger <[EMAIL PROTECTED]>
+ * The author of this part: Marcus Boerger <[EMAIL PROTECTED]>
*
*/
/*
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h:1.2
php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h:1.3
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h:1.2 Sun Aug 24 21:44:16
2003
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h Mon Sep 22 22:42:47 2003
@@ -34,6 +34,6 @@
#include "mbfl_defs.h"
#include "mbfilter.h"
-MBFLAPI extern const mbfl_encoding mbfl_encoding_8bit;
+extern const mbfl_encoding mbfl_encoding_8bit;
#endif /* MBFL_MBFILTER_8BIT_H */
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h:1.2
php-src/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h:1.3
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h:1.2 Sun Aug 24 21:44:16
2003
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h Mon Sep 22 22:42:47 2003
@@ -33,8 +33,8 @@
#include "mbfl_defs.h"
#include "mbfilter.h"
-MBFLAPI extern const mbfl_encoding mbfl_encoding_pass;
-MBFLAPI extern const struct mbfl_convert_vtbl vtbl_pass;
+extern const mbfl_encoding mbfl_encoding_pass;
+extern const struct mbfl_convert_vtbl vtbl_pass;
MBFLAPI extern int mbfl_filt_conv_pass(int c, mbfl_convert_filter *filter);
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h:1.2
php-src/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h:1.3
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h:1.2 Sun Aug 24 21:44:16
2003
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h Mon Sep 22 22:42:47 2003
@@ -34,6 +34,6 @@
#include "mbfl_defs.h"
#include "mbfilter.h"
-MBFLAPI extern const mbfl_encoding mbfl_encoding_wchar;
+extern const mbfl_encoding mbfl_encoding_wchar;
#endif /* MBFL_MBFILTER_WCHAR_H */
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h:1.2
php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h:1.3
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h:1.2 Sun Aug 24 21:44:16
2003
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h Mon Sep 22 22:42:47 2003
@@ -45,12 +45,12 @@
MBFLAPI extern mbfl_allocators *__mbfl_allocators;
-#define mbfl_malloc __mbfl_allocators->malloc
-#define mbfl_realloc __mbfl_allocators->realloc
-#define mbfl_calloc __mbfl_allocators->calloc
-#define mbfl_free __mbfl_allocators->free
-#define mbfl_pmalloc __mbfl_allocators->pmalloc
-#define mbfl_prealloc __mbfl_allocators->preallloc
-#define mbfl_pfree __mbfl_allocators->pfree
+#define mbfl_malloc (__mbfl_allocators->malloc)
+#define mbfl_realloc (__mbfl_allocators->realloc)
+#define mbfl_calloc (__mbfl_allocators->calloc)
+#define mbfl_free (__mbfl_allocators->free)
+#define mbfl_pmalloc (__mbfl_allocators->pmalloc)
+#define mbfl_prealloc (__mbfl_allocators->preallloc)
+#define mbfl_pfree (__mbfl_allocators->pfree)
#endif /* MBFL_ALLOCATORS_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
