Fix buildnsmux

4 files changed, 9 insertions, 4 deletions

diff --git a/lnode.c b/lnode.c
index b94629b34..c31cbd64c 100644
--- a/lnode.c
+++ b/lnode.c
@@ -27,6 +27,8 @@
 /*---------------------------------------------------------------------------*/
 #define _GNU_SOURCE
 /*---------------------------------------------------------------------------*/
+#include <assert.h>
+/*---------------------------------------------------------------------------*/
 #include "lnode.h"
 #include "debug.h"
 #include "node.h"
diff --git a/node.c b/node.c
index dc820acce..3c42d2847 100644
--- a/node.c
+++ b/node.c
@@ -34,6 +34,7 @@
 #include <stdio.h>
 #include <argz.h>
 #include <hurd/fsys.h>
+#include <assert.h>
 /*---------------------------------------------------------------------------*/
 #include "debug.h"
 #include "node.h"
diff --git a/nsmux.c b/nsmux.c
index 568e3661e..47153b871 100644
--- a/nsmux.c
+++ b/nsmux.c
@@ -35,6 +35,8 @@
 #include <fcntl.h>
 #include <hurd/paths.h>
 #include <hurd/fsys.h>
+#include <assert.h>
+#include <sys/sysmacros.h>
 /*---------------------------------------------------------------------------*/
 #include "debug.h"
 #include "options.h"
@@ -1109,8 +1111,8 @@ error_t
 		if (asprintf (argz, "%s%c%d%c%d",
 			      (S_ISCHR (np->nn_translated)
 			       ? _HURD_CHRDEV : _HURD_BLKDEV),
-			      0, major (np->nn_stat.st_rdev),
-			      0, minor (np->nn_stat.st_rdev)) < 0)
+			      0, gnu_dev_major (np->nn_stat.st_rdev),
+			      0, gnu_dev_minor (np->nn_stat.st_rdev)) < 0)
 		  return ENOMEM;
 		*argz_len = strlen (*argz) + 1;
 		*argz_len += strlen (*argz + *argz_len) + 1;
diff --git a/nsmux.h b/nsmux.h
index 324d7ce86..068791193 100644
--- a/nsmux.h
+++ b/nsmux.h
@@ -64,8 +64,8 @@ extern mach_port_t underlying_node;
 extern io_statbuf_t underlying_node_stat;
 /*---------------------------------------------------------------------------*/
 /*The translator callbacks required by netfs_S_dir_lookup*/
-fshelp_fetch_root_callback1_t _netfs_translator_callback1;
-fshelp_fetch_root_callback2_t _netfs_translator_callback2;
+extern fshelp_fetch_root_callback1_t _netfs_translator_callback1;
+extern fshelp_fetch_root_callback2_t _netfs_translator_callback2;
 /*---------------------------------------------------------------------------*/
 
 /*---------------------------------------------------------------------------*/