diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2006-09-24 18:06:37 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2006-09-24 18:06:37 +0000 |
| commit | e55036a346c3bf60a79f106ce8cce2283299b5cb (patch) | |
| tree | 7d91ed946cffe942b6840d8bb16061fd186e537f /ext/imap | |
| parent | b4ca4a0fab1389eca381a866df1d7c6b1a803388 (diff) | |
| download | php-git-e55036a346c3bf60a79f106ce8cce2283299b5cb.tar.gz | |
Fixed bug #38941 (imap extension does not compile against new version of
the imap library).
Diffstat (limited to 'ext/imap')
| -rw-r--r-- | ext/imap/config.m4 | 5 | ||||
| -rw-r--r-- | ext/imap/php_imap.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ext/imap/config.m4 b/ext/imap/config.m4 index e2782e3265..bd23b22398 100644 --- a/ext/imap/config.m4 +++ b/ext/imap/config.m4 @@ -114,6 +114,11 @@ if test "$PHP_IMAP" != "no"; then 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 diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index a4e7b7ae0f..05cf6c2b74 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -75,7 +75,11 @@ static char *php_mail_gets(readfn_t f, void *stream, unsigned long size, GETS_DA 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); |