Replace tests for SYSV_SYSTEM_DIR with HAVE_DIRENT_H, set via autoconf

* configure.in: Check for dirent.h

* dired.c, sysdep.c: test HAVE_DIRENT_H instead of SYSV_SYSTEM_DIR

* s/aix4-2.h, s/bsd-common.h, s/cygwin.h, s/gnu-linux.h,
  s/msdos.h, s/usg5-4.h: don't define SYSV_SYSTEM_DIR

* sed2v2.inp (HAVE_DIRENT_H): Edit to 1

10 files changed, 16 insertions, 28 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a3f0384194a..17a82aea13e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-27  Chad Brown  <yandros@mit.edu>
+
+        Replace tests for SYSV_SYSTEM_DIR with HAVE_DIRENT_H, set via autoconf
+        * dired.c, sysdep.c: test HAVE_DIRENT_H instead of SYSV_SYSTEM_DIR
+
+        * s/aix4-2.h, s/bsd-common.h, s/cygwin.h, s/gnu-linux.h,
+          s/msdos.h, s/usg5-4.h: don't define SYSV_SYSTEM_DIR
+
 2010-07-29  Dan Nicolaescu  <dann@ics.uci.edu>
 
         Rename s/usg5-4.h -> s/usg5-4-common.h.
diff --git a/src/config.in b/src/config.in
index 647c8804dff..e6e67319bdd 100644
--- a/src/config.in
+++ b/src/config.in
@@ -150,6 +150,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `difftime' function. */
 #undef HAVE_DIFFTIME
 
+/* Define to 1 if you have the <dirent.h> header file. */
+#undef HAVE_DIRENT_H
+
 /* Define to 1 if you have the `dup2' function. */
 #undef HAVE_DUP2
 
diff --git a/src/dired.c b/src/dired.c
index aec64f94379..fc033ac7e39 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -48,29 +48,22 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    Since applying strlen to the name always works, we'll just do that.  */
 #define NAMLEN(p) strlen (p->d_name)
 
-#ifdef SYSV_SYSTEM_DIR
+#ifdef HAVE_DIRENT_H
 
 #include <dirent.h>
 #define DIRENTRY struct dirent
 
-#else /* not SYSV_SYSTEM_DIR */
+#else /* not HAVE_DIRENT_H */
 
-#ifdef MSDOS
-#include <dirent.h>
-#else
 #include <sys/dir.h>
-#endif
-
 #include <sys/stat.h>
 
-#ifndef MSDOS
 #define DIRENTRY struct direct
 
 extern DIR *opendir (char *);
 extern struct direct *readdir (DIR *);
 
-#endif /* not MSDOS */
-#endif /* not SYSV_SYSTEM_DIR */
+#endif /* HAVE_DIRENT_H */
 
 /* Some versions of Cygwin don't have d_ino in `struct dirent'.  */
 #if defined(MSDOS) || defined(__CYGWIN__)
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index cf06f9befe0..84920f888e1 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -47,11 +47,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
 #define HAVE_SOCKETS
 
-
-/* Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir library
-   functions.  Almost, but not quite the same as the 4.2 functions.  */
-#define SYSV_SYSTEM_DIR
-
 /* The file containing the kernel's symbol table is called /unix.  */
 #define KERNEL_FILE "/unix"
 
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
index ffb7a637488..bf78f4ec347 100644
--- a/src/s/bsd-common.h
+++ b/src/s/bsd-common.h
@@ -45,8 +45,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define HAVE_TERMIOS
 #define NO_TERMIO
 
-#define SYSV_SYSTEM_DIR
-
 /* If the system's imake configuration file defines `NeedWidePrototypes'
    as `NO', we must define NARROWPROTO manually.  Such a define is
    generated in the Makefile generated by `xmkmf'.  If we don't
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 93df925fcab..1b78ada53bd 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -89,7 +89,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define CYGWIN 1
 
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
-#define SYSV_SYSTEM_DIR 1
 
 #define HAVE_SOCKETS
 
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 80092f725fc..cf3b3079726 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -124,8 +124,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define INTERRUPT_INPUT
 #endif /* emacs */
 
-#define SYSV_SYSTEM_DIR       /* use dirent.h */
-
 #define POSIX                 /* affects getpagesize.h and systty.h */
 
 /* This is to work around mysterious gcc failures in some system versions.
diff --git a/src/s/msdos.h b/src/s/msdos.h
index ffbae8777e2..8dd8e3cf490 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -38,8 +38,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
    It sets the Lisp variable system-type.  */
 #define SYSTEM_TYPE "ms-dos"
 
-#define SYSV_SYSTEM_DIR
-
 /* subprocesses should be defined if you want to have code for
    asynchronous subprocesses (as used in M-x compile and M-x shell).
    This is the only system that needs this.  */
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index 0fcc6623450..7ff5c6f7be3 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -35,10 +35,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    for terminal control.  */
 #define HAVE_TERMIO
 
-/* Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir library
-   functions. Almost, but not quite the same as the 4.2 functions.  */
-#define SYSV_SYSTEM_DIR
-
 /* The file containing the kernel's symbol table is called /unix.  */
 #define KERNEL_FILE "/unix"
 
diff --git a/src/sysdep.c b/src/sysdep.c
index d720c7c5811..c5b0cb361db 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2447,7 +2447,7 @@ croak (char *badfunc)
 
 /* Directory routines for systems that don't have them. */
 
-#ifdef SYSV_SYSTEM_DIR
+#ifdef HAVE_DIRENT_H
 
 #include <dirent.h>
 
@@ -2464,7 +2464,7 @@ closedir (DIR *dirp /* stream from opendir */)
   return rtnval;
 }
 #endif /* not HAVE_CLOSEDIR */
-#endif /* SYSV_SYSTEM_DIR */
+#endif /* HAVE_DIRENT_H */
 
 
 int