MFH (fixes linking errors when --enable-mbstring is used)

diff --git a/main/rfc1867.c b/main/rfc1867.c
index 6857a92e12c23378aba800dc51aab5032b04c574..9a0fe18daa5867a81bc2822a1c97a726c87117b4 100644 (file)
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -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 @@ static char *substring_conf(char *start, int len, char quote  TSRMLS_DC)
                        *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 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
                                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, '\\');