diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-03-07 19:15:28 +0100 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-03-07 19:15:28 +0100 |
| commit | f7bdc914481292c6e446cc1d92bf6f555e124045 (patch) | |
| tree | adff845e9aef75bf32f4546526f1ecf102cb58c3 /debian | |
| parent | 5f76922e9f8a60d86ae1911fd99a6bfacaab649f (diff) | |
fix mutable-types.patch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/mutable-types.patch | 90 |
1 files changed, 15 insertions, 75 deletions
diff --git a/debian/patches/mutable-types.patch b/debian/patches/mutable-types.patch index 5857d1c..c8e7b86 100644 --- a/debian/patches/mutable-types.patch +++ b/debian/patches/mutable-types.patch @@ -1,78 +1,3 @@ -diff --git a/include/mach/default_pager.defs b/include/mach/default_pager.defs -index e2154e2..242734d 100644 ---- a/include/mach/default_pager.defs -+++ b/include/mach/default_pager.defs -@@ -30,18 +30,22 @@ subsystem default_pager 2275; - #include <mach/mach_types.defs> - #include <mach/default_pager_types.defs> - -+#ifdef DEFAULT_PAGER_IMPORTS -+DEFAULT_PAGER_IMPORTS -+#endif -+ - routine default_pager_object_create( -- default_pager : mach_port_t; -+ default_pager : default_pager_t; - out memory_object : memory_object_t = - MACH_MSG_TYPE_MAKE_SEND; - object_size : vm_size_t); - - routine default_pager_info( -- default_pager : mach_port_t; -+ default_pager : default_pager_t; - out info : default_pager_info_t); - - routine default_pager_objects( -- default_pager : mach_port_t; -+ default_pager : default_pager_t; - out objects : default_pager_object_array_t, - CountInOut, Dealloc; - out ports : mach_port_array_t = -@@ -49,17 +53,17 @@ routine default_pager_objects( - CountInOut, Dealloc); - - routine default_pager_object_pages( -- default_pager : mach_port_t; -+ default_pager : default_pager_t; - memory_object : memory_object_name_t; - out pages : default_pager_page_array_t, - CountInOut, Dealloc); - - routine default_pager_paging_file( -- default_pager : mach_port_t; -+ default_pager : default_pager_t; - master_device_port : mach_port_t; - filename : default_pager_filename_t; - add : boolean_t); - - routine default_pager_register_fileserver( -- default_pager : mach_port_t; -+ default_pager : default_pager_t; - fileserver_port : mach_port_t); -diff --git a/include/mach/default_pager_types.defs b/include/mach/default_pager_types.defs -index 3164f04..bca0f01 100644 ---- a/include/mach/default_pager_types.defs -+++ b/include/mach/default_pager_types.defs -@@ -29,6 +29,19 @@ - - #include <mach/std_types.defs> - -+type default_pager_t = mach_port_t -+ ctype: mach_port_t -+#ifdef DEFAULT_PAGER_INTRAN -+ intran: DEFAULT_PAGER_INTRAN -+#endif -+#ifdef DEFAULT_PAGER_OUTTRAN -+ outtran: DEFAULT_PAGER_OUTTRAN -+#endif -+#ifdef DEFAULT_PAGER_DESTRUCTOR -+ destructor: DEFAULT_PAGER_DESTRUCTOR -+#endif -+ ; -+ - type default_pager_info_t = struct[3] of natural_t; - - type default_pager_object_t = struct[2] of natural_t; diff --git a/include/mach/mach_types.defs b/include/mach/mach_types.defs index 607d5d9..bfce6cb 100644 --- a/include/mach/mach_types.defs @@ -109,3 +34,18 @@ index ea7989a..7732955 100644 #if SEQNOS serverprefix seqnos_; serverdemux seqnos_memory_object_server; +diff --git a/include/mach/memory_object_default.defs b/include/mach/memory_object_default.defs +index 0eac271..cfd54a4 100644 +--- a/include/mach/memory_object_default.defs ++++ b/include/mach/memory_object_default.defs +@@ -40,6 +40,10 @@ subsystem + #include <mach/std_types.defs> + #include <mach/mach_types.defs> + ++#ifdef MEMORY_OBJECT_IMPORTS ++MEMORY_OBJECT_IMPORTS ++#endif ++ + #if SEQNOS + serverprefix seqnos_; + serverdemux seqnos_memory_object_default_server; |