Changeset b0b4592e in mainline for uspace/lib/posix/include/posix/sys/mman.h

Timestamp:

2014-03-15T19:21:53Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c773adc

Parents:

2034f98 (diff), 8cffdf5 (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 mainline changes

File:

• uspace/lib/posix/include/posix/sys/mman.h (modified) (2 diffs)

uspace/lib/posix/include/posix/sys/mman.h

@@ -40 +40 @@
 #endif
 
-#include "sys/types.h"
+#include "types.h"
 #include <abi/mm/as.h>
 
@@ -60 +60 @@
 #define PROT_EXEC  AS_AREA_EXEC
 
-extern void *mmap(void *start, size_t length, int prot, int flags, int fd,
+extern void *
+__POSIX_DEF__(mmap)(void *start, size_t length, int prot, int flags, int fd,
     __POSIX_DEF__(off_t) offset);
-extern int munmap(void *start, size_t length);
+extern int __POSIX_DEF__(munmap)(void *start, size_t length);