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

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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:

Merge remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• uspace/lib/posix/src/sys/mman.c (moved) (moved from uspace/lib/posix/source/sys/mman.c ) (3 diffs)

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

@@ -33 +33 @@
  */
 
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
-
 #include "../internal/common.h"
 #include <posix/sys/mman.h>
@@ -42 +39 @@
 #include <posix/unistd.h>
 
-void *posix_mmap(void *start, size_t length, int prot, int flags, int fd,
-    __POSIX_DEF__(off_t) offset)
+void *mmap(void *start, size_t length, int prot, int flags, int fd,
+    off_t offset)
 {
         if (!start)
@@ -57 +54 @@
 }
 
-int posix_munmap(void *start, size_t length)
+int munmap(void *start, size_t length)
 {
         int rc = as_area_destroy(start);