tony2001                Thu Oct  5 14:28:33 2006 UTC

  Modified files:              
    /php-src/ext/imap   php_imap.c 
  Log:
  MFB: fix build with new c-client
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.224&r2=1.225&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.224 php-src/ext/imap/php_imap.c:1.225
--- php-src/ext/imap/php_imap.c:1.224   Sun Sep 24 18:06:53 2006
+++ php-src/ext/imap/php_imap.c Thu Oct  5 14:28:33 2006
@@ -26,7 +26,7 @@
    | PHP 4.0 updates:  Zeev Suraski <[EMAIL PROTECTED]>                       |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_imap.c,v 1.224 2006/09/24 18:06:53 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.225 2006/10/05 14:28:33 tony2001 Exp $ */
 
 #define IMAP41
 
@@ -2177,7 +2177,12 @@
        dest.size = 0;
 
        cpytxt(&src, Z_STRVAL_PP(str), Z_STRLEN_PP(str));
+
+#ifndef HAVE_NEW_MIME2TEXT
        utf8_mime2text(&src, &dest);
+#else
+       utf8_mime2text(&src, &dest, U8T_CANONICAL);
+#endif
        RETVAL_STRINGL(dest.data, dest.size, 1);
        if (dest.data) {
                free(dest.data);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to