From: Lionel Sambuc <lionel@minix3.org>
Date: Thu, 18 Apr 2013 09:08:16 +0000 (+0200)
Subject: moving prototypes to lib.h
X-Git-Tag: v3.3.0~634
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=58f5d8dd5e5889fa2b6f0357563703220d2c2fbd;p=minix.git

moving prototypes to lib.h

Change-Id: If53d3f5ee761b10e0f3d4346a0c5b39ba7901c65
---

diff --git a/drivers/readclock/readclock.c b/drivers/readclock/readclock.c
index 7f3c0d7f3..5f70e4fff 100644
--- a/drivers/readclock/readclock.c
+++ b/drivers/readclock/readclock.c
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
+#include <lib.h>
 #include <minix/type.h>
 #include <minix/const.h>
 #include <minix/callnr.h>
diff --git a/include/lib.h b/include/lib.h
index 0ddf280e6..fa2761a3b 100644
--- a/include/lib.h
+++ b/include/lib.h
@@ -28,4 +28,15 @@ void _loadname(const char *_name, message *_msgptr);
 int _len(const char *_s);
 void _begsig(int _dummy);
 
+int getprocnr(void);
+int getnprocnr(pid_t pid);
+int getpprocnr(void);
+int _pm_findproc(char *proc_name, int *proc_nr);
+int mapdriver(char *label, int major, int style, int flags);
+pid_t getnpid(endpoint_t proc_ep);
+uid_t getnuid(endpoint_t proc_ep);
+gid_t getngid(endpoint_t proc_ep);
+ssize_t pread64(int fd, void *buf, size_t count, u64_t where);
+ssize_t pwrite64(int fd, const void *buf, size_t count, u64_t where);
+
 #endif /* _LIB_H */
diff --git a/include/minix/drivers.h b/include/minix/drivers.h
index f7752dedb..f975b0c22 100644
--- a/include/minix/drivers.h
+++ b/include/minix/drivers.h
@@ -11,18 +11,19 @@
 
 /* The following are so basic, all the *.c files get them automatically. */
 #include <minix/config.h>	/* MUST be first */
-#include <minix/type.h>
-#include <minix/com.h>
-#include <minix/dmap.h>
+#include <minix/bitmap.h>
 #include <minix/callnr.h>
-#include <sys/types.h>
+#include <minix/com.h>
 #include <minix/const.h>
 #include <minix/devio.h>
+#include <minix/dmap.h>
+#include <minix/spin.h>
 #include <minix/syslib.h>
 #include <minix/sysutil.h>
 #include <minix/timers.h>
-#include <minix/spin.h>
-#include <minix/bitmap.h>
+#include <minix/type.h>
+#include <sys/param.h>
+#include <sys/types.h>
 
 #include <machine/interrupt.h>	/* IRQ vectors and miscellaneous ports */
 #if defined(__i386__)
@@ -30,13 +31,13 @@
 #include <machine/ports.h>	/* Well-known ports */
 #endif
 
-#include <string.h>
-#include <signal.h>
-#include <stdlib.h>
+#include <errno.h>
+#include <lib.h>
 #include <limits.h>
+#include <signal.h>
 #include <stddef.h>
-#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
-#include <sys/param.h>
 
 #endif
diff --git a/include/unistd.h b/include/unistd.h
index 0f7c3f487..7d2b1f965 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -326,17 +326,6 @@ int	unlinkat(int, const char *, int);
 int lseek64(int fd, u64_t _offset, int _whence, u64_t *_newpos);
 #if defined(_NETBSD_SOURCE)
 #include <minix/type.h>
-
-int getprocnr(void);
-int getnprocnr(pid_t pid);
-int getpprocnr(void);
-int _pm_findproc(char *proc_name, int *proc_nr);
-int mapdriver(char *label, int major, int style, int flags);
-pid_t getnpid(endpoint_t proc_ep);
-uid_t getnuid(endpoint_t proc_ep);
-gid_t getngid(endpoint_t proc_ep);
-ssize_t pread64(int fd, void *buf, size_t count, u64_t where);
-ssize_t pwrite64(int fd, const void *buf, size_t count, u64_t where);
 #endif /* defined(_NETBSD_SOURCE) */
 #endif /* __minix */
 
diff --git a/lib/libpuffs/fs.h b/lib/libpuffs/fs.h
index 5350a0574..15b076144 100644
--- a/lib/libpuffs/fs.h
+++ b/lib/libpuffs/fs.h
@@ -16,6 +16,7 @@
 #include <minix/type.h>
 #include <minix/dmap.h>
 
+#include <lib.h>
 #include <limits.h>
 #include <errno.h>
 
diff --git a/sbin/newfs_ext2fs/mke2fs.c b/sbin/newfs_ext2fs/mke2fs.c
index b5a739163..53c9cfa9b 100644
--- a/sbin/newfs_ext2fs/mke2fs.c
+++ b/sbin/newfs_ext2fs/mke2fs.c
@@ -120,6 +120,7 @@ __RCSID("$NetBSD: mke2fs.c,v 1.14 2010/09/10 15:51:20 tsutsui Exp $");
 
 #include <err.h>
 #include <errno.h>
+#include <lib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/servers/ext2/fs.h b/servers/ext2/fs.h
index 775fb9626..3511d5434 100644
--- a/servers/ext2/fs.h
+++ b/servers/ext2/fs.h
@@ -15,6 +15,7 @@
 #include <minix/type.h>
 #include <minix/dmap.h>
 
+#include <lib.h>
 #include <limits.h>
 #include <errno.h>
 
diff --git a/servers/ipc/inc.h b/servers/ipc/inc.h
index 4579a5989..24b879600 100644
--- a/servers/ipc/inc.h
+++ b/servers/ipc/inc.h
@@ -19,6 +19,7 @@
 #include <machine/vmparam.h>
 #include <sys/vm.h>
 
+#include <lib.h>
 #include <time.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/servers/iso9660fs/inc.h b/servers/iso9660fs/inc.h
index 85301ca6f..7883cba51 100644
--- a/servers/iso9660fs/inc.h
+++ b/servers/iso9660fs/inc.h
@@ -4,6 +4,7 @@
 #define VERBOSE		0	/* display diagnostics */
 
 #include <sys/types.h>
+#include <lib.h>
 #include <limits.h>
 #include <errno.h>
 #include <signal.h>
diff --git a/servers/mfs/fs.h b/servers/mfs/fs.h
index ea0f194dd..571dc03ed 100644
--- a/servers/mfs/fs.h
+++ b/servers/mfs/fs.h
@@ -15,6 +15,7 @@
 #include <minix/type.h>
 #include <minix/dmap.h>
 
+#include <lib.h>
 #include <limits.h>
 #include <errno.h>
 
diff --git a/servers/pfs/fs.h b/servers/pfs/fs.h
index 99470f050..a5e0ca40f 100644
--- a/servers/pfs/fs.h
+++ b/servers/pfs/fs.h
@@ -14,6 +14,7 @@
 #include <minix/dmap.h>
 
 #include <minix/vfsif.h>
+#include <lib.h>
 #include <limits.h>
 #include <errno.h>
 #include <minix/syslib.h>
diff --git a/sys/sys/statvfs.h b/sys/sys/statvfs.h
index 111f17ce6..f663f152f 100644
--- a/sys/sys/statvfs.h
+++ b/sys/sys/statvfs.h
@@ -66,7 +66,7 @@ struct statvfs {
 	unsigned long f_bsize;  /* File system block size. */
 	unsigned long f_frsize; /* Fundamental file system block size. */
 	fsblkcnt_t    f_blocks; /* Total number of blocks on file system */
-			     /* in units of f_frsize. */
+				/* in units of f_frsize. */
 	fsblkcnt_t    f_bfree;  /* Total number of free blocks. */
 	fsblkcnt_t    f_bavail; /* Number of free blocks available to */
 	                        /* non-privileged process. */
diff --git a/sys/sys/syslimits.h b/sys/sys/syslimits.h
index 9773e0a0e..5ae3be3e7 100644
--- a/sys/sys/syslimits.h
+++ b/sys/sys/syslimits.h
@@ -41,6 +41,7 @@
 #if defined(_STANDALONE)
 /* LSC: In NetBSD this gets pulled in through libkern.h */
 #include <sys/null.h>
+uint32_t crc32(uint32_t, const uint8_t *, size_t);
 #endif /* defined(_STANDALONE) */
 #endif /* defined(__minix) */