X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lib-src%2Fpop.c;h=bbec8aba7cf52a25f007818a1ff6fbe29d5e1806;hb=d4b236b78c9e33a6b6a26ac428c36191013d97c6;hp=728d1cae33747726cacaf2e5c9f3d12e686a3db2;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git

diff --git a/lib-src/pop.c b/lib-src/pop.c
index 728d1ca..bbec8ab 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -38,7 +38,6 @@ Boston, MA 02111-1307, USA.  */
 
 #include <sys/types.h>
 #ifdef WINDOWSNT
-#include "ntlib.h"
 #include <winsock.h>
 #undef SOCKET_ERROR
 #define RECV(s,buf,len,flags) recv(s,buf,len,flags)
@@ -77,7 +76,9 @@ extern struct servent *hes_getservbyname (/* char *, char * */);
 #include <sys/stat.h>
 #include <sys/file.h>
 #include "../src/syswait.h"
+#ifndef WINDOWSNT
 #include "../src/systime.h"
+#endif
 #include <stdlib.h>
 #include <string.h>
 
@@ -183,6 +184,7 @@ pop_open (char *host, char *username, char *password, int flags)
       username = getenv ("USER");
       if (! (username && *username))
 	{
+#ifndef WINDOWSNT
 	  username = getlogin ();
 	  if (! (username && *username))
 	    {
@@ -198,6 +200,10 @@ pop_open (char *host, char *username, char *password, int flags)
 		  return (0);
 		}
 	    }
+#else
+	  strcpy (pop_error, "Could not determine username");
+	  return (0);
+#endif
 	}
     }
 
@@ -247,10 +253,12 @@ pop_open (char *host, char *username, char *password, int flags)
  
   if ((! password) && (! DONT_NEED_PASSWORD))
     {
+#ifndef WINDOWSNT
       if (! (flags & POP_NO_GETPASS))
 	{
 	  password = getpass ("Enter POP password:");
 	}
+#endif
       if (! password)
 	{
 	  strcpy (pop_error, "Could not determine POP password");