cvs: php4(PHP_4_2_0) /main rfc1867.c
| From: | Edin Kadribasic | Date: | Sun, 14 Jul 2002 08:31:45 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) /main rfc1867.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12829@lists.php.net to get a copy of this message | ||
edink Sun Jul 14 04:31:45 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/main rfc1867.c
Log:
MFH (fixes linking errors when --enable-mbstring is used)
Index: php4/main/rfc1867.c
diff -u php4/main/rfc1867.c:1.94.2.9 php4/main/rfc1867.c:1.94.2.10
--- php4/main/rfc1867.c:1.94.2.9 Fri Jul 5 14:33:03 2002
+++ php4/main/rfc1867.c Sun Jul 14 04:31:45 2002
@@ -16,7 +16,7 @@
| Jani Taskinen <sniper@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: rfc1867.c,v 1.94.2.9 2002/07/05 18:33:03 sniper Exp $ */
+/* $Id: rfc1867.c,v 1.94.2.10 2002/07/14 08:31:45 edink Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -32,7 +32,7 @@
#include "php_variables.h"
#include "rfc1867.h"
-#if HAVE_MBSTRING
+#if HAVE_MBSTRING && MBSTR_ENC_TRANS && !defined(COMPILE_DL_MBSTRING)
#include "ext/mbstring/mbstring.h"
#endif
@@ -451,7 +451,7 @@
*resp++ = start[++i];
} else {
*resp++ = start[i];
-#if HAVE_MBSTRING
+#if HAVE_MBSTRING && MBSTR_ENC_TRANS && !defined(COMPILE_DL_MBSTRING)
if (mbstr_is_mb_leadbyte(start+i TSRMLS_CC)) {
*resp++ = start[++i];
}
@@ -832,7 +832,7 @@
sprintf(lbuf, "%s_name", param);
}
-#if HAVE_MBSTRING
+#if HAVE_MBSTRING && MBSTR_ENC_TRANS && !defined(COMPILE_DL_MBSTRING)
s = mbstr_strrchr(filename, '\\' TSRMLS_CC);
#else
s = strrchr(filename, '\\');