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

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

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 <_bits/decls.h>
 
-#include <offset.h>
+__C_DECLS_BEGIN;
 
 struct dirent {
-        char d_name[NAME_MAX + 1];
+        char d_name[256];
 };
 
-typedef struct {
-        int fd;
-        struct dirent res;
-        aoff64_t pos;
-} DIR;
+typedef struct __dirstream DIR;
 
 extern DIR *opendir(const char *);
@@ -55 +51 @@
 extern int closedir(DIR *);
 
+__C_DECLS_END;
+
 #endif