moving prototypes to lib.h

Change-Id: If53d3f5ee761b10e0f3d4346a0c5b39ba7901c65

diff --git a/drivers/readclock/readclock.c b/drivers/readclock/readclock.c
index 7f3c0d7f359e8dfae34371de1a3c3933e29f289e..5f70e4fff82ca7ee0118df69cb43dadb0f00f1c7 100644 (file)
--- 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 0ddf280e64d7aea64cecb7d90d6d35f3c80eb9a0..fa2761a3b01f42aa48781b650170e508ba2a3450 100644 (file)
--- 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 f7752dedb7800d9cbc041caf80f5a784a94e63b3..f975b0c2246566024f9c9af5a37b5affc42e20ba 100644 (file)
--- 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 0f7c3f4871730733462f3263b277d859a594c417..7d2b1f965491887833f6237878c6c3065b769787 100644 (file)
--- 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 5350a0574bf483179d6715df0ff4684c0908d648..15b07614408ff64ba1f52b71170d95e758765638 100644 (file)
--- 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 b5a739163ae9e241a8eb6425ac3b3b6909f87ef2..53c9cfa9bc727fe68e53ad8433ff8e78ae700680 100644 (file)
--- 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 775fb9626e41870578d724b71965c88d3c4baf58..3511d5434815bf1850f05adc05a9b598fffc336e 100644 (file)
--- 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 4579a598942cc99bf31632f95c4ddd86a63aefd1..24b879600ee333b7f45fd5d3809b534cf3848c83 100644 (file)
--- 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 85301ca6f07cc7370d2ced848c678fac48c516aa..7883cba51a26c2f09410f2d892b73c79dfb4ee22 100644 (file)
--- 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 ea0f194dd93bdaebc494243e8790f5d8a1c166b0..571dc03ed07dc13d6af444df728ccb3f9e8d6284 100644 (file)
--- 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 99470f0503047ec7bfac580487d5b093e720b3de..a5e0ca40ff7b76deef219326f32ed730c1db68ce 100644 (file)
--- 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 111f17ce6371bffca93c0fe54b7f6e61c62e27b6..f663f152f8b382c16117309dc45310f55bd523f7 100644 (file)
--- 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 9773e0a0e0b65372e259775ccde4b54b67fb8d00..5ae3be3e70604f769d1f6babf0da8acf2713df69 100644 (file)
--- 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) */