mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Code Issues Projects Releases Wiki Activity

(Ffile_attributes): Fix last change, removing BSD4_3

Browse source 
kluge.
This commit is contained in:
Gerd Moellmann 2001-01-03 12:43:54 +00:00
parent bafb434cc5
commit 0a974c854d
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/dired.c
View file

@ -1,5 +1,6 @@
/* Lisp functions for making directory listings.
Copyright (C) 1985, 1986, 1993, 1994, 1999 Free Software Foundation, Inc.
Copyright (C) 1985, 1986, 1993, 1994, 1999, 2000, 2001
Free Software Foundation, Inc.
This file is part of GNU Emacs.
@ -820,7 +821,7 @@ If file does not exist, returns nil.")
Lisp_Object values[12];
Lisp_Object encoded;
struct stat s;
#ifdef BSD4_2
#if defined (BSD4_2) || defined (BSD4_3)
Lisp_Object dirname;
struct stat sdir;
#endif
@ -863,10 +864,7 @@ If file does not exist, returns nil.")
values[7] = make_float ((double)s.st_size);
filemodestring (&s, modes);
values[8] = make_string (modes, 10);
#ifdef BSD4_3 /* Gross kludge to avoid lack of "#if defined(...)" in VMS */
#define BSD4_2 /* A new meaning to the term `backwards compatibility' */
#endif
#ifdef BSD4_2 /* file gid will be dir gid */
#if defined (BSD4_2) || defined (BSD4_3) /* file gid will be dir gid */
dirname = Ffile_name_directory (filename);
if (! NILP (dirname))
encoded = ENCODE_FILE (dirname);
@ -877,9 +875,6 @@ If file does not exist, returns nil.")
#else /* file gid will be egid */
values[9] = (s.st_gid != getegid ()) ? Qt : Qnil;
#endif /* BSD4_2 (or BSD4_3) */
#ifdef BSD4_3
#undef BSD4_2 /* ok, you can look again without throwing up */
#endif
/* Cast -1 to avoid warning if int is not as wide as VALBITS. */
if (s.st_ino & (((EMACS_INT) (-1)) << VALBITS))
/* To allow inode numbers larger than VALBITS, separate the bottom