include sys/types.h, no longer need to typedef size_t

[unix-history] / usr / src / include / dirent.h

diff --git a/usr/src/include/dirent.h b/usr/src/include/dirent.h
index 5d7d136..158e606 100644 (file)
--- a/usr/src/include/dirent.h
+++ b/usr/src/include/dirent.h
@@ -4,14 +4,14 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)dirent.h    5.13 (Berkeley) %G%
+ *     @(#)dirent.h    5.18 (Berkeley) %G%

  */
 
  */
 

-#ifndef _DIRENT_
-#define _DIRENT_
+#ifndef _DIRENT_H_
+#define _DIRENT_H_

 
 /*
 
 /*

- * A directory entry has a struct direct at the front of it, containing its
+ * A directory entry has a struct dirent at the front of it, containing its

  * inode number, the length of the entry, and the length of the name
  * contained in the entry.  These are followed by the name padded to a 4
  * byte boundary with null bytes.  All names are guaranteed null terminated.
  * inode number, the length of the entry, and the length of the name
  * contained in the entry.  These are followed by the name padded to a 4
  * byte boundary with null bytes.  All names are guaranteed null terminated.


@@ -57,28 +57,25 @@ typedef struct _dirdesc {
 
 #endif /* _POSIX_SOURCE */
 
 
 #endif /* _POSIX_SOURCE */
 

-#if __STDC__ || c_plusplus
-extern DIR *opendir(const char *);
-extern struct dirent *readdir(DIR *);
-extern void rewinddir(DIR *);
-extern int closedir(DIR *);
-#ifndef _POSIX_SOURCE
-extern long telldir(const DIR *);
-extern void seekdir(DIR *, long);
-extern int scandir(const char *, struct direct ***,
-    int (* )(struct direct *), int (* )(void *, void *));
-extern int alphasort(const void *, const void *);
-#endif
-#else
-extern DIR *opendir();
-extern struct dirent *readdir();
-extern void rewinddir();
-extern int closedir();
+#ifndef KERNEL
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+DIR *opendir __P((const char *));
+struct dirent *readdir __P((DIR *));
+void rewinddir __P((DIR *));
+int closedir __P((DIR *));

 #ifndef _POSIX_SOURCE
 #ifndef _POSIX_SOURCE

-extern long telldir();
-extern void seekdir();
-extern int scandir();
-extern int alphasort();
-#endif
-#endif
-#endif /* _DIRENT_ */
+long telldir __P((const DIR *));
+void seekdir __P((DIR *, long));
+int scandir __P((const char *, struct dirent ***,
+    int (*)(struct dirent *), int (*)(const void *, const void *)));
+int alphasort __P((const void *, const void *));
+int getdirentries __P((int, char *, int, long *));
+#endif /* not POSIX */
+__END_DECLS
+
+#endif /* !KERNEL */
+
+#endif /* !_DIRENT_H_ */