summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authordeischen <deischen@FreeBSD.org>2000-12-11 04:00:36 +0000
committerdeischen <deischen@FreeBSD.org>2000-12-11 04:00:36 +0000
commit45428979ecbb7d5c9a2ca5dc110aee85e48d7de2 (patch)
tree4ff93d9c2aa5d2573156e1b352a4574235595006 /include
parentdb0edd3c391b9475070b42d03b53f9a058882b13 (diff)
downloadFreeBSD-src-45428979ecbb7d5c9a2ca5dc110aee85e48d7de2.zip
FreeBSD-src-45428979ecbb7d5c9a2ca5dc110aee85e48d7de2.tar.gz
Move telldir position recording type definitions and prototypes
to "telldir.h" in order to prevent namespace pollution in <dirent.h> (which was including <sys/queue.h>). Add $FreeBSD$ to rewinddir.c and seekdir.c.
Diffstat (limited to 'include')
-rw-r--r--include/dirent.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/dirent.h b/include/dirent.h
index d24c146..2028d7b 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -42,7 +42,6 @@
* the getdirentries(2) system call.
*/
#include <sys/dirent.h>
-#include <sys/queue.h>
#ifdef _POSIX_SOURCE
typedef void * DIR;
@@ -53,7 +52,7 @@ typedef void * DIR;
/* definitions for library routines operating on directories. */
#define DIRBLKSIZ 1024
-struct _ddloc;
+struct _telldir; /* see telldir.h */
/* structure describing an open directory. */
typedef struct _dirdesc {
@@ -65,8 +64,7 @@ typedef struct _dirdesc {
long dd_seek; /* magic cookie returned by getdirentries */
long dd_rewind; /* magic cookie for rewinding */
int dd_flags; /* flags for readdir */
- long dd_loccnt; /* Index of entry for sequential readdir's */
- LIST_HEAD(, _ddloc) dd_locq; /* telldir position recording */
+ struct _telldir *dd_td; /* telldir position recording */
} DIR;
#define dirfd(dirp) ((dirp)->dd_fd)
OpenPOWER on IntegriCloud