Changeset b0b4592e in mainline for uspace/lib/posix

Timestamp:

2014-03-15T19:21:53Z (12 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

Location:

uspace/lib/posix

Files:

• Makefile (modified) (4 diffs)
• include/posix/math.h (modified) (1 diff)
• include/posix/sys/mman.h (modified) (2 diffs)
• source/sys/mman.c (moved) (moved from uspace/lib/c/generic/mman.c ) (3 diffs)

uspace/lib/posix/Makefile

@@ -36 +36 @@
 
 INCLUDE_LIBC = ./include/libc
+INCLUDE_LIBMATH = ./include/libmath
 
 LIBC_FILE = $(LIBC_PREFIX)/libc.a
@@ -46 +47 @@
 COLLISIONS_LIST = collisions.list
 
-PRE_DEPEND = $(INCLUDE_LIBC)
+PRE_DEPEND = $(INCLUDE_LIBC) $(INCLUDE_LIBMATH)
 EXTRA_CLEAN = \
-        $(INCLUDE_LIBC) \
+        $(INCLUDE_LIBC) $(INCLUDE_LIBMATH) \
         $(REDEFS_HIDE_LIBC) $(REDEFS_SHOW_LIBPOSIX) \
         $(COLLISIONS_LIST)
@@ -73 +74 @@
         source/string.c \
         source/strings.c \
+        source/sys/mman.c \
         source/sys/stat.c \
         source/sys/wait.c \
@@ -81 +83 @@
 
 $(INCLUDE_LIBC): ../c/include
+        ln -s -f -n ../$^ $@
+
+$(INCLUDE_LIBMATH): ../math/include
         ln -s -f -n ../$^ $@
 

uspace/lib/posix/include/posix/math.h

@@ -36 +36 @@
 #define POSIX_MATH_H_
 
-#include "libc/math.h"
+#include "libmath/math.h"
 
 #endif /* POSIX_MATH_H_ */

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);
 
 

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

@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libposix
  * @{
  */
@@ -33 +33 @@
  */
 
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <as.h>
-#include <unistd.h>
+#define LIBPOSIX_INTERNAL
+#define __POSIX_DEF__(x) posix_##x
 
-void *mmap(void *start, size_t length, int prot, int flags, int fd,
-    aoff64_t offset)
+#include "../internal/common.h"
+#include <posix/sys/mman.h>
+#include <posix/sys/types.h>
+#include <libc/as.h>
+#include <posix/unistd.h>
+
+void *posix_mmap(void *start, size_t length, int prot, int flags, int fd,
+    __POSIX_DEF__(off_t) offset)
 {
         if (!start)
@@ -53 +57 @@
 }
 
-int munmap(void *start, size_t length)
+int posix_munmap(void *start, size_t length)
 {
         return as_area_destroy(start);