--- php-4.0b4pl1/ext/imap/imap.c.wiget	Mon Feb 21 14:50:40 2000
+++ php-4.0b4pl1/ext/imap/imap.c	Thu Mar 16 14:55:05 2000
@@ -431,23 +431,23 @@
 	unsigned long sa_all =	SA_MESSAGES | SA_RECENT | SA_UNSEEN |
 				SA_UIDNEXT | SA_UIDVALIDITY;
 
-#if !(WIN32|WINNT)
+#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 */
-#if !(WIN32|WINNT)
+#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 */
-#if !(WIN32|WINNT)
 	mail_link (&mmdfdriver);      /* link in the mmdf driver */
 	mail_link (&newsdriver);      /* link in the news driver */
 	mail_link (&philedriver);     /* link in the phile driver */
+#endif	
+#if !(WIN32|WINNT)
 	auth_link (&auth_log);        /* link in the log authenticator */
 #endif
 	mail_link (&dummydriver);     /* link in the dummy driver */