diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-04-15 20:35:49 +0200 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-04-15 20:35:49 +0200 |
| commit | 76bd1a1067a0a9e896e3e46a219884fead806fff (patch) | |
| tree | 30ccde0cab590f1c4117c6091fee8c3323d49cbc /debian | |
| parent | dcd756bd72be7fe89cb1f71e7e72746180bc4547 (diff) | |
refresh includefest.patch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/includefest.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/debian/patches/includefest.patch b/debian/patches/includefest.patch index 2a1a8ca6..32ca0d57 100644 --- a/debian/patches/includefest.patch +++ b/debian/patches/includefest.patch @@ -310,6 +310,30 @@ index 1e70da2..d759311 100644 error_t diskfs_S_file_get_fs_options (struct protid *cred, +diff --git a/libdiskfs/fsmutations.h b/libdiskfs/fsmutations.h +index 6248708..3f9362b 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 bf955d2..d10c964 100644 --- a/libdiskfs/init-startup.c @@ -372,6 +396,22 @@ index f1b9bf7..75bd790 100644 error_t netfs_S_file_notice_changes (struct protid *user, +diff --git a/libnetfs/mutations.h b/libnetfs/mutations.h +index 51ca871..e60a220 100644 +--- a/libnetfs/mutations.h ++++ b/libnetfs/mutations.h +@@ -31,7 +31,7 @@ + #define FSYS_INTRAN control_t begin_using_control_port (fsys_t) + #define FSYS_DESTRUCTOR end_using_control_port (control_t) + +-#define FILE_IMPORTS import "netfs.h"; import "priv.h"; +-#define IO_IMPORTS import "netfs.h"; import "priv.h"; +-#define FSYS_IMPORTS import "netfs.h"; import "priv.h"; +-#define IFSOCK_IMPORTS import "netfs.h"; import "priv.h"; ++#define FILE_IMPORTS import "libnetfs/netfs.h"; import "libnetfs/priv.h"; ++#define IO_IMPORTS import "libnetfs/netfs.h"; import "libnetfs/priv.h"; ++#define FSYS_IMPORTS import "libnetfs/netfs.h"; import "libnetfs/priv.h"; ++#define IFSOCK_IMPORTS import "libnetfs/netfs.h"; import "libnetfs/priv.h"; diff --git a/libtrivfs/file-access.c b/libtrivfs/file-access.c index 8702954..f289a23 100644 --- a/libtrivfs/file-access.c @@ -1021,6 +1061,26 @@ index 106031d..c479c55 100644 #include <assert.h> #include <fcntl.h> +diff --git a/libtrivfs/mig-mutate.h b/libtrivfs/mig-mutate.h +index fad5389..cc15d38 100644 +--- a/libtrivfs/mig-mutate.h ++++ b/libtrivfs/mig-mutate.h +@@ -21,12 +21,12 @@ + + #define FILE_INTRAN trivfs_protid_t trivfs_begin_using_protid (file_t) + #define FILE_DESTRUCTOR trivfs_end_using_protid (trivfs_protid_t) +-#define FILE_IMPORTS import "mig-decls.h"; ++#define FILE_IMPORTS import "libtrivfs/mig-decls.h"; + + #define IO_INTRAN trivfs_protid_t trivfs_begin_using_protid (io_t) + #define IO_DESTRUCTOR trivfs_end_using_protid (trivfs_protid_t) +-#define IO_IMPORTS import "mig-decls.h"; ++#define IO_IMPORTS import "libtrivfs/mig-decls.h"; + + #define FSYS_INTRAN trivfs_control_t trivfs_begin_using_control (fsys_t) + #define FSYS_DESTRUCTOR trivfs_end_using_control (trivfs_control_t) +-#define FSYS_IMPORTS import "mig-decls.h"; ++#define FSYS_IMPORTS import "libtrivfs/mig-decls.h"; diff --git a/pfinet/tunnel.c b/pfinet/tunnel.c index 495356c..6a7f355 100644 --- a/pfinet/tunnel.c |