Formerly ../dirent/dirent.h.~10~

diff --git a/dirent/dirent.h b/dirent/dirent.h
index b6348e9..075a63c 100644 (file)
--- a/dirent/dirent.h
+++ b/dirent/dirent.h
@@ -13,7 +13,7 @@ Library General Public License for more details.
 
 You should have received a copy of the GNU Library General Public
 License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+not, write to the, 1992 Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
 /*
@@ -25,9 +25,7 @@ Cambridge, MA 02139, USA.  */
 #define        _DIRENT_H       1
 #include <features.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+__BEGIN_DECLS
 
 #include <gnu/types.h>
 
@@ -37,48 +35,48 @@ extern "C" {
 
 /* Directory entry structure.  */
 struct dirent
-  {
-    __ino_t d_fileno;  /* File serial number.  */
-    size_t d_namlen;   /* Length of the file name.  */
+{
+  __ino_t d_fileno;            /* File serial number.  */
+  size_t d_namlen;             /* Length of the file name.  */
 
-    /* Only this member is in the POSIX standard.  */
-    char d_name[1];    /* File name (actually longer).  */
-  };
+  /* Only this member is in the POSIX standard.  */
+  char d_name[1];              /* File name (actually longer).  */
+};
 
 #if defined(__USE_BSD) || defined(__USE_MISC)
-#define        d_ino           d_fileno        /* Backward compatibility.  */
+#define        d_ino           d_fileno/* Backward compatibility.  */
 #endif
 
 /* Directory stream type.  */
 typedef struct
-  {
-    int __fd;                  /* File descriptor.  */
+{
+  int __fd;                    /* File descriptor.  */
 
-    char *__data;              /* Directory block.  */
-    size_t __allocation;       /* Space allocated for the block.  */
-    size_t __offset;           /* Current offset into the block.  */
-    size_t __size;             /* Total valid data in the block.  */
+  char *__data;                        /* Directory block.  */
+  size_t __allocation;         /* Space allocated for the block.  */
+  size_t __offset;             /* Current offset into the block.  */
+  size_t __size;               /* Total valid data in the block.  */
 
-    struct dirent __entry;     /* Returned by `readdir'.  */
-  } DIR;
+  struct dirent __entry;       /* Returned by `readdir'.  */
+} DIR;
 
 
 /* Open a directory stream on NAME.
    Return a DIR stream on the directory, or NULL if it could not be opened.  */
-extern DIR *EXFUN(opendir, (CONST char *__name));
+extern DIR *opendir __P ((__const char *__name));
 
 /* Close the directory stream DIRP.
    Return 0 if successful, -1 if not.  */
-extern int EXFUN(closedir, (DIR *__dirp));
+extern int closedir __P ((DIR * __dirp));
 
 /* Read a directory entry from DIRP.
    Return a pointer to a `struct dirent' describing the entry,
    or NULL for EOF or error.  The storage returned may be overwritten
    by a later readdir call on the same DIR stream.  */
-extern struct dirent *EXFUN(readdir, (DIR *__dirp));
+extern struct dirent *readdir __P ((DIR * __dirp));
 
 /* Rewind DIRP to the beginning of the directory.  */
-extern void EXFUN(rewinddir, (DIR *__dirp));
+extern void rewinddir __P ((DIR * __dirp));
 
 #if defined(__USE_BSD) || defined(__USE_MISC)
 
@@ -97,38 +95,36 @@ extern void EXFUN(rewinddir, (DIR *__dirp));
 #include <gnu/types.h>
 
 /* Seek to position POS on DIRP.  */
-extern void EXFUN(seekdir, (DIR *__dirp, __off_t __pos));
+extern void seekdir __P ((DIR * __dirp, __off_t __pos));
 
 /* Return the current position of DIRP.  */
-extern __off_t EXFUN(telldir, (DIR *__dirp));
+extern __off_t telldir __P ((DIR * __dirp));
 
 /* Scan the directory DIR, calling SELECT on each directory entry.
    Entries for which SELECT returns nonzero are individually malloc'd,
    sorted using qsort with CMP, and collected in a malloc'd array in
    *NAMELIST.  Returns the number of entries selected, or -1 on error.  */
-extern int EXFUN(scandir, (CONST char *__dir,
-                          struct dirent ***__namelist,
-                          int EXFUN((*__select), (struct dirent *));
-                          int EXFUN((*__cmp), (CONST PTR, CONST PTR))));
+extern int scandir __P ((__const char *__dir,
+                        struct dirent *** __namelist,
+                        int (*__select) __P ((struct dirent *)),
+                   int (*__cmp) __P ((__const __ptr_t, __const __ptr_t))));
 
 /* Function to compare two `struct dirent's alphabetically.  */
-extern int EXFUN(alphasort, (CONST PTR, CONST PTR));
+     extern int alphasort __P ((__const __ptr_t, __const __ptr_t));
 
 
 /* Read directory entries from FD into BUF, reading at most NBYTES.
    Reading starts at offset *BASEP, and *BASEP is updated with the new
    position after reading.  Returns the number of bytes read; zero when at
    end of directory; or -1 for errors.  */
-extern __ssize_t EXFUN(__getdirentries, (int __fd, char *__buf,
-                                        size_t __nbytes, __off_t *__basep));
-extern __ssize_t EXFUN(getdirentries, (int __fd, char *__buf,
-                                      size_t __nbytes, __off_t *__basep));
+     extern __ssize_t __getdirentries __P ((int __fd, char *__buf,
+                                      size_t __nbytes, __off_t * __basep));
+     extern __ssize_t getdirentries __P ((int __fd, char *__buf,
+                                      size_t __nbytes, __off_t * __basep));
 
 
-#endif /* Use BSD or misc.  */
+#endif /* Use BSD or misc.  */
 
-#ifdef __cplusplus
-}
-#endif
+__END_DECLS
 
-#endif /* dirent.h  */
+#endif /* dirent.h  */