Changeset d5a89a3 in mainline for uspace/lib/c/include/dirent.h

Timestamp:

2019-02-11T22:31:04Z (7 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

aaf9789c

Parents:

e3272101 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merging with upstream/master

File:

• uspace/lib/c/include/dirent.h (modified) (2 diffs)

uspace/lib/c/include/dirent.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_DIRENT_H_
-#define LIBC_DIRENT_H_
+#ifndef _LIBC_DIRENT_H_
+#define _LIBC_DIRENT_H_
 
 #define NAME_MAX  256
-
-#include <offset.h>
 
 struct dirent {
@@ -44 +42 @@
 };
 
-typedef struct {
-        int fd;
-        struct dirent res;
-        aoff64_t pos;
-} DIR;
+typedef struct __dirstream DIR;
 
 extern DIR *opendir(const char *);