diff options
author | Miles Bader <miles@gnu.org> | 2005-04-21 05:59:53 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2005-04-21 05:59:53 +0000 |
commit | 135f59d513767b781223f651cd6a5f139f270c2c (patch) | |
tree | a7e4b5e507f3435fa5070e9f956be279f5c3df27 /src/filelock.c | |
parent | db92e81ec1e176c3bd2bc58bf6d6a33d3df5c07b (diff) | |
parent | 2375e71aff23becd70d22689895512e2d95d3c0f (diff) | |
download | emacs-135f59d513767b781223f651cd6a5f139f270c2c.tar.gz |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-39
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 258-271)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 66)
- Update from CVS
Diffstat (limited to 'src/filelock.c')
-rw-r--r-- | src/filelock.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/filelock.c b/src/filelock.c index fc214b5a34a..9cdaea4ef13 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 |