Changeset bc56f30 in mainline for uspace/lib/posix/src/sys/mman.c

Timestamp:

2019-05-27T12:38:26Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

0d14c25

Parents:

4d51c60

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-13 16:06:49)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-05-27 12:38:26)

Message:

Make some libc and libposix headers usable in C++

These headers either get included from standard C++ headers,
or are standard themselves, which means any unnamespaced nonstandard
identifiers are a problem. This commit attempts to fix those
issues, and removes hacks previously used in libcpp to work around it.

File:

• uspace/lib/posix/src/sys/mman.c (modified) (2 diffs)

uspace/lib/posix/src/sys/mman.c

@@ -39 +39 @@
 #include <unistd.h>
 
+static int _prot_to_as(int prot)
+{
+        int ret = 0;
+
+        if (prot & PROT_READ)
+                ret |= AS_AREA_READ;
+
+        if (prot & PROT_WRITE)
+                ret |= AS_AREA_WRITE;
+
+        if (prot & PROT_EXEC)
+                ret |= AS_AREA_EXEC;
+
+        return ret;
+}
+
 void *mmap(void *start, size_t length, int prot, int flags, int fd,
     off_t offset)
@@ -53 +69 @@
                 return MAP_FAILED;
 
-        return as_area_create(start, length, prot, AS_AREA_UNPAGED);
+        return as_area_create(start, length, _prot_to_as(prot), AS_AREA_UNPAGED);
 }