cvs: php-src /ext/imap config.m4 php_imap.c

iliaa Sun Sep 24 18:06:53 2006 UTC Modified files: /php-src/ext/imap php_imap.c config.m4 Log: MFB: Fixed bug #38941 (imap extension does not compile against new version of the imap library). http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.223&r2=1.224&diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.223 php-src/ext/imap/php_imap.c:1.224 --- php-src/ext/imap/php_imap.c:1.223 Tue Sep 5 11:24:23 2006 +++ php-src/ext/imap/php_imap.c Sun Sep 24 18:06:53 2006 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.223 2006/09/05 11:24:23 tony2001 Exp $ */ +/* $Id: php_imap.c,v 1.224 2006/09/24 18:06:53 iliaa Exp $ */ #define IMAP41 @@ -75,7 +75,11 @@ void rfc822_date(char *date); char *cpystr(const char *str); char *cpytxt(SIZEDTEXT *dst, char *text, unsigned long size); +#ifndef HAVE_NEW_MIME2TEXT long utf8_mime2text(SIZEDTEXT *src, SIZEDTEXT *dst); +#else +long utf8_mime2text (SIZEDTEXT *src, SIZEDTEXT *dst, long flags); +#endif unsigned long find_rightmost_bit(unsigned long *valptr); void fs_give(void **block); void *fs_get(size_t size); http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.69&r2=1.70&diff_format=u Index: php-src/ext/imap/config.m4 diff -u php-src/ext/imap/config.m4:1.69 php-src/ext/imap/config.m4:1.70 --- php-src/ext/imap/config.m4:1.69 Sun May 29 23:16:41 2005 +++ php-src/ext/imap/config.m4 Sun Sep 24 18:06:53 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.69 2005/05/29 23:16:41 sniper Exp $ +dnl $Id: config.m4,v 1.70 2006/09/24 18:06:53 iliaa Exp $ dnl AC_DEFUN([IMAP_INC_CHK],[if test -r "$i$1/c-client.h"; then @@ -114,6 +114,11 @@ AC_EGREP_HEADER(mail_fetch_overview_sequence, $IMAP_INC_DIR/mail.h, [ AC_DEFINE(HAVE_IMAP2004,1,[ ]) ]) + + dnl Check for new version of the utf8_mime2text() function + AC_EGREP_HEADER(mail_append_set, $IMAP_INC_DIR/mail.h, [ + AC_DEFINE(HAVE_NEW_MIME2TEXT,1,[ ]) + ]) dnl Check for c-client version 2001 old_CPPFLAGS=$CPPFLAGS