[Cvs-cvs] ccvs/vms ChangeLog config.h config.h.in vms.h n...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     06/07/07 12:34:07

Modified files:
        vms            : ChangeLog config.h config.h.in vms.h 
Removed files:
        vms            : ndir.h 

Log message:
        * config.h.in [HAVE_DIRENT_H]: Define - this is correct on OpenVMS.
        [HAVE_NDIR_H]: Remove definition.
        * ndir.h: Remove this obsolescent file.
        * vms.h: Don't include "ndir.h" here.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/vms/ChangeLog?cvsroot=cvs&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/ccvs/vms/config.h?cvsroot=cvs&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/ccvs/vms/config.h.in?cvsroot=cvs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/ccvs/vms/vms.h?cvsroot=cvs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/ccvs/vms/ndir.h?cvsroot=cvs&r1=1.4&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/vms/ChangeLog,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- ChangeLog   6 Jul 2006 13:58:46 -0000       1.109
+++ ChangeLog   7 Jul 2006 12:34:07 -0000       1.110
@@ -1,3 +1,10 @@
+2006-07-07  Derek Price  <address@hidden>
+
+       * config.h.in [HAVE_DIRENT_H]: Define - this is correct on OpenVMS.
+       [HAVE_NDIR_H]: Remove definition.
+       * ndir.h: Remove this obsolescent file.
+       * vms.h: Don't include "ndir.h" here.
+
 2006-07-06  Derek Price  <address@hidden>
 
        * filesubr.c (last_component): Remove, in favor of GNULIB version from

Index: config.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/vms/config.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- config.h    9 Nov 2005 10:59:21 -0000       1.37
+++ config.h    7 Jul 2006 12:34:07 -0000       1.38
@@ -41,8 +41,8 @@
 /* Define to empty if the keyword does not work.  */
 /* #undef const */
 
-/* Define if you have <dirent.h>.  */
-/* #undef DIRENT */
+/* Define to 1 if you have the <dirent.h> header file. */
+#define HAVE_DIRENT_H 1
 
 /* Define if you have <sys/param.h> */
 /* #undef HAVE_SYS_PARAM_H */
@@ -72,9 +72,6 @@
 /* Define to `int' if <sys/types.h> doesn't define.  */
 /* #undef mode_t */
 
-/* Define if you don't have <dirent.h>, but have <ndir.h>.  */
-#define HAVE_NDIR_H 1
-
 /* Define to `int' if <sys/types.h> doesn't define.  */
 /* #undef pid_t */
 

Index: config.h.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/vms/config.h.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- config.h.in 9 Nov 2005 15:46:10 -0000       1.7
+++ config.h.in 7 Jul 2006 12:34:07 -0000       1.8
@@ -34,8 +34,8 @@
 /* Define to empty if the keyword does not work.  */
 /* #undef const */
 
-/* Define if you have <dirent.h>.  */
-/* #undef DIRENT */
+/* Define to 1 if you have the <dirent.h> header file. */
+#define HAVE_DIRENT_H 1
 
 /* Define if you have <sys/param.h> */
 /* #undef HAVE_SYS_PARAM_H */
@@ -65,9 +65,6 @@
 /* Define to `int' if <sys/types.h> doesn't define.  */
 /* #undef mode_t */
 
-/* Define if you don't have <dirent.h>, but have <ndir.h>.  */
-#define HAVE_NDIR_H 1
-
 /* Define to `int' if <sys/types.h> doesn't define.  */
 /* #undef pid_t */
 

Index: vms.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/vms/vms.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- vms.h       9 Nov 2005 10:59:21 -0000       1.7
+++ vms.h       7 Jul 2006 12:34:07 -0000       1.8
@@ -19,14 +19,6 @@
 #define STDOUT_FILENO 1
 #define STDERR_FILENO 2
 
-extern int fnmatch(char *pattern, char *string, int options);
-
-/* With the define of HAVE_NDIR_H in config.h, lib/system.h and
-   diff/system.h should include ndir.h for us.  But I'm too lazy to
-   track down and make _sure_ all bases are covered, so I'm leaving in
-   this include for now.  */
-#include "ndir.h"
-
 #include "pwd.h"
 #include "pipe.h"
 

Index: ndir.h
===================================================================
RCS file: ndir.h
diff -N ndir.h
--- ndir.h      6 Feb 2001 15:41:38 -0000       1.4
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,63 +0,0 @@
-/*
-       <ndir.h> -- definitions for 4.2BSD-compatible directory access
-
-       28-dec-1994     Richard Levitte
-       See ChangeLog for more recent modification history.
-*/
-
-#ifndef NDIR_H
-
-#if 0
-#ifndef FAB$C_BID
-#include <fab.h>
-#endif
-#endif
-#ifndef NAM$C_BID
-#include <nam.h>
-#endif
-#if 0
-#ifndef RMS$_SUC
-#include <rmsdef.h>
-#endif
-#include <dir.h>
-#else
-#define        DIR$S_NAME      80
-#endif
-
-#define DIRBLKSIZ      512             /* size of directory block */
-#ifdef VMS
-#define MAXNAMLEN      (DIR$S_NAME + 7) /* 80 plus room for version #.  */
-#define MAXFULLSPEC    NAM$C_MAXRSS /* Maximum full spec */
-#else
-#define MAXNAMLEN      15              /* maximum filename length */
-#endif /* VMS */
-       /* NOTE:  MAXNAMLEN must be one less than a multiple of 4 */
-
-struct direct                          /* data from readdir() */
-       {
-       long            d_ino;          /* inode number of entry */
-       unsigned short  d_reclen;       /* length of this record */
-       unsigned short  d_namlen;       /* length of string in d_name */
-       char            d_name[MAXNAMLEN+1];    /* name of file */
-       };
-
-typedef struct
-       {
-       int     dd_fd;                  /* file descriptor */
-       int     dd_loc;                 /* offset in block */
-       int     dd_size;                /* amount of valid data */
-       char    dd_buf[DIRBLKSIZ];      /* directory block */
-       }       DIR;                    /* stream data from opendir() */
-
-extern DIR             *vms_opendir();
-extern struct direct   *vms_readdir();
-#ifndef VMS
-extern long            telldir();
-extern void            seekdir();
-#endif
-extern int             vms_closedir();
-
-#define rewinddir( dirp )      seekdir( dirp, 0L )
-
-#define NDIR_H 1
-#endif /* ndir.h */