--- php-4.0RC2/ext/imap/php_imap.c.wiget	Tue May  2 02:44:23 2000
+++ php-4.0RC2/ext/imap/php_imap.c	Thu May 11 03:30:48 2000
@@ -386,25 +386,23 @@
 
 
 #if 1
-#ifndef PHP_WIN32
+#if 0
 	mail_link(&unixdriver);   /* link in the unix driver */
 #endif
 	mail_link(&imapdriver);      /* link in the imap driver */
 	mail_link(&nntpdriver);      /* link in the nntp driver */
 	mail_link(&pop3driver);      /* link in the pop3 driver */
-#ifndef PHP_WIN32
+#if 0
 	mail_link(&mhdriver);        /* link in the mh driver */
 	mail_link(&mxdriver);        /* link in the mx driver */
-#endif
 	mail_link(&mbxdriver);       /* link in the mbx driver */
 	mail_link(&tenexdriver);     /* link in the tenex driver */
 	mail_link(&mtxdriver);       /* link in the mtx driver */
-#ifndef PHP_WIN32
 	mail_link(&mmdfdriver);      /* link in the mmdf driver */
 	mail_link(&newsdriver);      /* link in the news driver */
 	mail_link(&philedriver);     /* link in the phile driver */
-	auth_link(&auth_log);        /* link in the log authenticator */
 #endif
+	auth_link(&auth_log);        /* link in the log authenticator */
 	mail_link(&dummydriver);     /* link in the dummy driver */
 #else
 	/* link in the c-client mail and auth drivers */