From 4dc5ce8fd810e87219cb8cc18743c5dba2f9e98b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Sun, 3 Aug 2014 23:28:33 +0200
Subject: [PATCH] mknod[at](): moves from unistd.h to sys/stat.h
* this solves #10883.
---
headers/posix/sys/stat.h | 2 ++
headers/posix/unistd.h | 3 ---
src/system/libroot/posix/sys/Jamfile | 1 +
src/system/libroot/posix/{unistd => sys}/mknod.c | 2 +-
src/system/libroot/posix/unistd/Jamfile | 1 -
5 files changed, 4 insertions(+), 5 deletions(-)
rename src/system/libroot/posix/{unistd => sys}/mknod.c (94%)
diff --git a/headers/posix/sys/stat.h b/headers/posix/sys/stat.h
index 358354c6a8..05df3d9f4a 100644
--- a/headers/posix/sys/stat.h
+++ b/headers/posix/sys/stat.h
@@ -120,6 +120,8 @@ extern int mkdir(const char *path, mode_t mode);
extern int mkdirat(int fd, const char *path, mode_t mode);
extern int mkfifo(const char *path, mode_t mode);
extern int mkfifoat(int fd, const char *path, mode_t mode);
+extern int mknod(const char *name, mode_t mode, dev_t dev);
+extern int mknodat(int fd, const char *name, mode_t mode, dev_t dev);
extern mode_t umask(mode_t cmask);
extern int utimensat(int fd, const char *path,
diff --git a/headers/posix/unistd.h b/headers/posix/unistd.h
index 92fa579fe6..f1ae943cda 100644
--- a/headers/posix/unistd.h
+++ b/headers/posix/unistd.h
@@ -196,9 +196,6 @@ extern int lchown(const char *path, uid_t owner, gid_t group);
extern int fchownat(int fd, const char *path, uid_t owner, gid_t group,
int flag);
-extern int mknod(const char *name, mode_t mode, dev_t dev);
-extern int mknodat(int fd, const char *name, mode_t mode, dev_t dev);
-
extern int getpagesize(void);
extern int getdtablesize(void);
extern long sysconf(int name);
diff --git a/src/system/libroot/posix/sys/Jamfile b/src/system/libroot/posix/sys/Jamfile
index db2e5ed62d..c4f9a29c3c 100644
--- a/src/system/libroot/posix/sys/Jamfile
+++ b/src/system/libroot/posix/sys/Jamfile
@@ -19,6 +19,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
itimer.cpp
mkdir.c
mkfifo.c
+ mknod.c
mman.cpp
rlimit.c
select.c
diff --git a/src/system/libroot/posix/unistd/mknod.c b/src/system/libroot/posix/sys/mknod.c
similarity index 94%
rename from src/system/libroot/posix/unistd/mknod.c
rename to src/system/libroot/posix/sys/mknod.c
index 2a28fe22ec..c5b45e4f26 100644
--- a/src/system/libroot/posix/unistd/mknod.c
+++ b/src/system/libroot/posix/sys/mknod.c
@@ -5,7 +5,7 @@
#include <errno.h>
-#include <unistd.h>
+#include <sys/stat.h>
#include <errno_private.h>
diff --git a/src/system/libroot/posix/unistd/Jamfile b/src/system/libroot/posix/unistd/Jamfile
index e9f6d2adbb..c57c52f8d8 100644
--- a/src/system/libroot/posix/unistd/Jamfile
+++ b/src/system/libroot/posix/unistd/Jamfile
@@ -28,7 +28,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
link.c
lockf.cpp
lseek.c
- mknod.c
mount.c
pause.c
pipe.c