Remove reference to defunct vms-pwd.h.

Also, for pwd.h, use HAVE_PWD_H, not !VMS.

diff --git a/src/editfns.c b/src/editfns.c
index 0cc567eb12418e2ab3305de735a1a4684251760c..cecb703cfe8782fa3de14e922e55ed4e21cad41f 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -23,9 +23,7 @@ Boston, MA 02111-1307, USA.  */
 #include <config.h>
 #include <sys/types.h>
 
-#ifdef VMS
-#include "vms-pwd.h"
-#else
+#ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif
 

diff --git a/src/fileio.c b/src/fileio.c
index d70c6704fa2404d32e107bf4abd2b6465e945c5a..ba1b68cf9b9a035999e9ac5be34abd9a95c361a0 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -47,9 +47,7 @@ Boston, MA 02111-1307, USA.  */
 #  define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
 #endif
 
-#ifdef VMS
-#include "vms-pwd.h"
-#else
+#ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif
 

diff --git a/src/filelock.c b/src/filelock.c
index bdfcda9ade08ced1d70f7b6eea14338b0527cd83..53b1be4912711431da28331fac0ec40e13e4e5b0 100644 (file)
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -26,11 +26,9 @@ Boston, MA 02111-1307, USA.  */
 #include <signal.h>
 #include <stdio.h>
 
-#ifdef VMS
-#include "vms-pwd.h"
-#else
+#ifdef HAVE_PWD_H
 #include <pwd.h>
-#endif /* not VMS */
+#endif
 
 #include <sys/file.h>
 #ifdef HAVE_FCNTL_H

diff --git a/src/xrdb.c b/src/xrdb.c
index e51a774dc477d01764ba660396ad905ba8c2d808..be73fcce636043bce53f6e39aaa65fcf27b8d6f8 100644 (file)
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -53,9 +53,7 @@ Boston, MA 02111-1307, USA.  */
 #include <X11/X.h>
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
-#ifdef VMS
-#include "vms-pwd.h"
-#else
+#ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif
 #include <sys/stat.h>