cvs: php4 /ext/mbstring mbfilter.c
| From: | Frank M. Kromann | Date: | Sat, 01 Jun 2002 05:45:38 +0000 |
| Subject: | cvs: php4 /ext/mbstring mbfilter.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12189@lists.php.net to get a copy of this message | ||
fmk Sat Jun 1 01:45:38 2002 EDT
Modified files:
/php4/ext/mbstring mbfilter.c
Log:
Makring function declarations match implementations (ZTS compilation)
Index: php4/ext/mbstring/mbfilter.c
diff -u php4/ext/mbstring/mbfilter.c:1.32 php4/ext/mbstring/mbfilter.c:1.33
--- php4/ext/mbstring/mbfilter.c:1.32 Wed May 29 05:15:28 2002
+++ php4/ext/mbstring/mbfilter.c Sat Jun 1 01:45:25 2002
@@ -79,7 +79,7 @@
*
*/
-/* $Id: mbfilter.c,v 1.32 2002/05/29 09:15:28 dets Exp $ */
+/* $Id: mbfilter.c,v 1.33 2002/06/01 05:45:25 fmk Exp $ */
#ifdef HAVE_CONFIG_H
@@ -974,7 +974,7 @@
mbfl_no_encoding_cp1251,
"Windows-1251",
"Windows-1251",
- &mbfl_encoding_cp1251_aliases,
+ (const char *(*)[])&mbfl_encoding_cp1251_aliases,
NULL,
MBFL_ENCTYPE_SBCS
};
@@ -985,7 +985,7 @@
mbfl_no_encoding_cp866,
"CP866",
"CP866",
- &mbfl_encoding_cp866_aliases,
+ (const char *(*)[])&mbfl_encoding_cp866_aliases,
NULL,
MBFL_ENCTYPE_SBCS
};
@@ -996,7 +996,7 @@
mbfl_no_encoding_koi8r,
"KOI8-R",
"KOI8-R",
- &mbfl_encoding_koi8r_aliases,
+ (const char *(*)[])&mbfl_encoding_koi8r_aliases,
NULL,
MBFL_ENCTYPE_SBCS
};
@@ -6286,7 +6286,7 @@
#if defined(HAVE_MBSTR_RU)
// all of this is so ugly now!
static int
-mbfl_filt_ident_cp1251(int c, mbfl_identify_filter *filter)
+mbfl_filt_ident_cp1251(int c, mbfl_identify_filter *filter TSRMLS_DC)
{
if (c >= 0x80 && c < 0xff)
filter->flag = 0;
@@ -6296,7 +6296,7 @@
}
static int
-mbfl_filt_ident_cp866(int c, mbfl_identify_filter *filter)
+mbfl_filt_ident_cp866(int c, mbfl_identify_filter *filter TSRMLS_DC)
{
if (c >= 0x80 && c < 0xff)
filter->flag = 0;
@@ -6306,7 +6306,7 @@
}
static int
-mbfl_filt_ident_koi8r(int c, mbfl_identify_filter *filter)
+mbfl_filt_ident_koi8r(int c, mbfl_identify_filter *filter TSRMLS_DC)
{
if (c >= 0x80 && c < 0xff)
filter->flag = 0;