summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThien-Thi Nguyen <ttn@gnuvola.org>2005-04-20 15:07:03 +0000
committerThien-Thi Nguyen <ttn@gnuvola.org>2005-04-20 15:07:03 +0000
commit5b9c0a1d12994c1a8fa2034967544d73d2e97ad5 (patch)
treeaf37004fc6a67cf3c7b817eb2faf252973c445cc
parentc791cb5408b26bd62f43c9aa00698fb9ffc829b8 (diff)
downloademacs-5b9c0a1d12994c1a8fa2034967544d73d2e97ad5.tar.gz
Remove reference to defunct vms-pwd.h.
For pwd.h, use HAVE_PWD_H, not !VMS.
-rw-r--r--src/dired.c6
-rw-r--r--src/editfns.c4
-rw-r--r--src/fileio.c4
-rw-r--r--src/filelock.c6
-rw-r--r--src/xrdb.c4
5 files changed, 8 insertions, 16 deletions
diff --git a/src/dired.c b/src/dired.c
index 62bf4beb384..87b48ba2d78 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -26,10 +26,10 @@ Boston, MA 02111-1307, USA. */
#include <sys/types.h>
#include <sys/stat.h>
-#ifdef VMS
-#include "vms-pwd.h"
-#else
+#ifdef HAVE_PWD_H
#include <pwd.h>
+#endif
+#ifndef VMS
#include <grp.h>
#endif
diff --git a/src/editfns.c b/src/editfns.c
index f77b9cafc80..ddf080a0359 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -24,9 +24,7 @@ Boston, MA 02111-1307, USA. */
#include <sys/types.h>
#include <stdio.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 7e24c94783b..e4786974860 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -45,9 +45,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 84540f79330..5ddec8616f8 100644
--- 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 852fa2b808c..957227b7942 100644
--- 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>