@@ -409,7 +409,7 @@ PHP_MINIT_FUNCTION(imap)
409
409
#ifndef PHP_WIN32
410
410
auth_link (& auth_log ); /* link in the log authenticator */
411
411
auth_link (& auth_md5 ); /* link in the cram-md5 authenticator */
412
- #if HAVE_IMAP_KRB && defined(HAVE_IMAP_AUTH_GSS )
412
+ #if defined( HAVE_IMAP_KRB ) && defined(HAVE_IMAP_AUTH_GSS )
413
413
auth_link (& auth_gss ); /* link in the gss authenticator */
414
414
#endif
415
415
auth_link (& auth_pla ); /* link in the plain authenticator */
@@ -665,26 +665,26 @@ PHP_RSHUTDOWN_FUNCTION(imap)
665
665
}
666
666
/* }}} */
667
667
668
- #if !defined( CCLIENTVERSION )
669
- #if HAVE_IMAP2007e
670
- #define CCLIENTVERSION "2007e"
671
- #elif HAVE_IMAP2007d
672
- #define CCLIENTVERSION "2007d"
673
- #elif HAVE_IMAP2007b
674
- #define CCLIENTVERSION "2007b"
675
- #elif HAVE_IMAP2007a
676
- #define CCLIENTVERSION "2007a"
677
- #elif HAVE_IMAP2004
678
- #define CCLIENTVERSION "2004"
679
- #elif HAVE_IMAP2001
680
- #define CCLIENTVERSION "2001"
681
- #elif HAVE_IMAP2000
682
- #define CCLIENTVERSION "2000"
683
- #elif defined(IMAP41 )
684
- #define CCLIENTVERSION "4.1"
685
- #else
686
- #define CCLIENTVERSION "4.0"
687
- #endif
668
+ #ifndef CCLIENTVERSION
669
+ # if defined( HAVE_IMAP2007e )
670
+ # define CCLIENTVERSION "2007e"
671
+ # elif defined( HAVE_IMAP2007d )
672
+ # define CCLIENTVERSION "2007d"
673
+ # elif defined( HAVE_IMAP2007b )
674
+ # define CCLIENTVERSION "2007b"
675
+ # elif defined( HAVE_IMAP2007a )
676
+ # define CCLIENTVERSION "2007a"
677
+ # elif defined( HAVE_IMAP2004 )
678
+ # define CCLIENTVERSION "2004"
679
+ # elif defined( HAVE_IMAP2001 )
680
+ # define CCLIENTVERSION "2001"
681
+ # elif defined( HAVE_IMAP2000 )
682
+ # define CCLIENTVERSION "2000"
683
+ # elif defined(IMAP41 )
684
+ # define CCLIENTVERSION "4.1"
685
+ # else
686
+ # define CCLIENTVERSION "4.0"
687
+ # endif
688
688
#endif
689
689
690
690
/* {{{ PHP_MINFO_FUNCTION
@@ -693,10 +693,10 @@ PHP_MINFO_FUNCTION(imap)
693
693
{
694
694
php_info_print_table_start ();
695
695
php_info_print_table_row (2 , "IMAP c-Client Version" , CCLIENTVERSION );
696
- #if HAVE_IMAP_SSL
696
+ #ifdef HAVE_IMAP_SSL
697
697
php_info_print_table_row (2 , "SSL Support" , "enabled" );
698
698
#endif
699
- #if HAVE_IMAP_KRB && HAVE_IMAP_AUTH_GSS
699
+ #if defined( HAVE_IMAP_KRB ) && defined( HAVE_IMAP_AUTH_GSS )
700
700
php_info_print_table_row (2 , "Kerberos Support" , "enabled" );
701
701
#endif
702
702
php_info_print_table_end ();
0 commit comments