summaryrefslogtreecommitdiff
path: root/libdiskfs
diff options
context:
space:
mode:
Diffstat (limited to 'libdiskfs')
-rw-r--r--libdiskfs/boot-start.c2
-rw-r--r--libdiskfs/file-chg.c2
-rw-r--r--libdiskfs/file-chmod.c1
-rw-r--r--libdiskfs/file-get-fs-opts.c1
-rw-r--r--libdiskfs/fsmutations.h10
-rw-r--r--libdiskfs/init-startup.c2
6 files changed, 12 insertions, 6 deletions
diff --git a/libdiskfs/boot-start.c b/libdiskfs/boot-start.c
index 9dd2751f..a60a1d0e 100644
--- a/libdiskfs/boot-start.c
+++ b/libdiskfs/boot-start.c
@@ -34,6 +34,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <argz.h>
#include <error.h>
#include <pids.h>
+#include "exec_S.h"
+#include "exec_startup_S.h"
#include "fsys_S.h"
#include "fsys_reply_U.h"
diff --git a/libdiskfs/file-chg.c b/libdiskfs/file-chg.c
index 2674398f..9da43e79 100644
--- a/libdiskfs/file-chg.c
+++ b/libdiskfs/file-chg.c
@@ -16,7 +16,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "priv.h"
-#include "fs_S.h"
+#include "fs_notify_S.h"
#include "fs_notify_U.h"
kern_return_t
diff --git a/libdiskfs/file-chmod.c b/libdiskfs/file-chmod.c
index 5dad2c78..df262ea3 100644
--- a/libdiskfs/file-chmod.c
+++ b/libdiskfs/file-chmod.c
@@ -16,6 +16,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "priv.h"
+#include "fs_S.h"
/* Implement file_chmod as described in <hurd/fs.defs>. */
error_t
diff --git a/libdiskfs/file-get-fs-opts.c b/libdiskfs/file-get-fs-opts.c
index 1e70da23..d7593118 100644
--- a/libdiskfs/file-get-fs-opts.c
+++ b/libdiskfs/file-get-fs-opts.c
@@ -23,6 +23,7 @@
#include <string.h>
#include <argz.h>
#include "priv.h"
+#include "fs_S.h"
error_t
diskfs_S_file_get_fs_options (struct protid *cred,
diff --git a/libdiskfs/fsmutations.h b/libdiskfs/fsmutations.h
index 6248708e..3f9362b9 100644
--- a/libdiskfs/fsmutations.h
+++ b/libdiskfs/fsmutations.h
@@ -26,14 +26,14 @@
#define FSYS_INTRAN control_t diskfs_begin_using_control_port (fsys_t)
#define FSYS_DESTRUCTOR diskfs_end_using_control_port (control_t)
-#define FILE_IMPORTS import "priv.h";
-#define IO_IMPORTS import "priv.h";
-#define FSYS_IMPORTS import "priv.h";
-#define IFSOCK_IMPORTS import "priv.h";
+#define FILE_IMPORTS import "libdiskfs/priv.h";
+#define IO_IMPORTS import "libdiskfs/priv.h";
+#define FSYS_IMPORTS import "libdiskfs/priv.h";
+#define IFSOCK_IMPORTS import "libdiskfs/priv.h";
#define EXEC_STARTUP_INTRAN \
bootinfo_t diskfs_begin_using_bootinfo_port (exec_startup_t)
#define EXEC_STARTUP_DESTRUCTOR \
diskfs_end_using_bootinfo (bootinfo_t)
#define EXEC_STARTUP_IMPORTS \
- import "priv.h";
+ import "libdiskfs/priv.h";
diff --git a/libdiskfs/init-startup.c b/libdiskfs/init-startup.c
index bf955d20..d10c9641 100644
--- a/libdiskfs/init-startup.c
+++ b/libdiskfs/init-startup.c
@@ -28,6 +28,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <hurd/startup.h>
#include <pids.h>
+#include "startup_S.h"
+
char *_diskfs_chroot_directory;
mach_port_t