Changeset 2def788 in mainline

Timestamp:

2006-09-04T20:34:52Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d681c17

Parents:

fadd381

Message:

Prototype for mmap() should be in mman.h.
Anyway, is there any common sense behind naming of mman.h and mman.c?

Location:

uspace

Files:

• console/console.c (modified) (1 diff)
• console/gcons.c (modified) (1 diff)
• libc/Makefile (modified) (1 diff)
• libc/generic/mman.c (moved) (moved from uspace/libc/generic/mmap.c ) (1 diff)
• libc/include/sys/mman.h (moved) (moved from uspace/libc/include/sys/mmap.h ) (1 diff)
• libc/malloc/malloc.c (modified) (1 diff)

uspace/console/console.c

@@ -48 +48 @@
 #include <libadt/fifo.h>
 #include <screenbuffer.h>
-#include <sys/mmap.h>
+#include <sys/mman.h>
 
 #include "gcons.h"

uspace/console/gcons.c

@@ -37 +37 @@
 #include <async.h>
 #include <stdio.h>
-#include <sys/mmap.h>
+#include <sys/mman.h>
 #include <string.h>
 #include <align.h>

uspace/libc/Makefile

@@ -73 +73 @@
         generic/err.c \
         generic/stdlib.c \
-        generic/mmap.c
+        generic/mman.c
 
 ARCH_SOURCES += \

uspace/libc/generic/mman.c

@@ -33 +33 @@
  */
 
-#include <sys/mmap.h>
+#include <sys/mman.h>
 #include <as.h>
 #include <unistd.h>

uspace/libc/include/sys/mman.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_MMAP_H_
-#define LIBC_MMAP_H_
+#ifndef LIBC_MMAN_H_
+#define LIBC_MMAN_H_
 
 #include <as.h>

uspace/libc/malloc/malloc.c

@@ -566 +566 @@
 #if HAVE_MMAP
 #ifndef LACKS_SYS_MMAN_H
-#include <sys/mmap.h>    /* for mmap */
+#include <sys/mman.h>    /* for mmap */
 #endif /* LACKS_SYS_MMAN_H */
 #ifndef LACKS_FCNTL_H