summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2014-02-25 01:50:46 +0100
committerJustus Winter <4winter@informatik.uni-hamburg.de>2014-02-25 01:50:46 +0100
commit125a5f4ef25047694af4a5b1f27aa43d06bb1c0b (patch)
tree4f4bfac8917a2487c70a5e091fbff69f34b4b5fc
parentda795191f4105f8ce9d688ad4d202bca33318b96 (diff)
fix fix-translator-functions.patch
-rw-r--r--debian/patches/fix-translator-functions.patch29
1 files changed, 9 insertions, 20 deletions
diff --git a/debian/patches/fix-translator-functions.patch b/debian/patches/fix-translator-functions.patch
index b3bfc7f9..1a40e4d8 100644
--- a/debian/patches/fix-translator-functions.patch
+++ b/debian/patches/fix-translator-functions.patch
@@ -306,21 +306,8 @@ index b2d98e1..0000000
- if (cred)
- ports_port_deref (cred);
-}
-diff --git a/libtrivfs/priv.h b/libtrivfs/priv.h
-index d92fe33..7b423d8 100644
---- a/libtrivfs/priv.h
-+++ b/libtrivfs/priv.h
-@@ -23,4 +23,8 @@
- #include <hurd/ports.h>
- #include "trivfs.h"
-
-+/* Type-aliases for mig. */
-+typedef struct trivfs_protid *trivfs_protid_t;
-+typedef struct trivfs_control *trivfs_control_t;
-+
- #endif
diff --git a/libtrivfs/trivfs.h b/libtrivfs/trivfs.h
-index cf817b5..2f8ee34 100644
+index cf817b5..e2a48b4 100644
--- a/libtrivfs/trivfs.h
+++ b/libtrivfs/trivfs.h
@@ -37,11 +37,6 @@ struct trivfs_protid
@@ -347,20 +334,22 @@ index cf817b5..2f8ee34 100644
/* The user must define these variables. */
extern int trivfs_fstype;
-@@ -267,40 +257,4 @@ error_t trivfs_add_port_bucket (struct port_bucket **bucket);
+@@ -266,41 +256,9 @@ error_t trivfs_add_port_bucket (struct port_bucket **bucket);
+ /* Remove the previously added dynamic port bucket BUCKET, freeing it
if it was allocated by trivfs_add_port_bucket. */
void trivfs_remove_port_bucket (struct port_bucket *bucket);
-
--
+-
+
-/* This stuff is for the sake of MiG stubs and could be in a private
- header. But it might be handy for users that override parts of the
- library. Moreover, since the stub headers will use all the imports we
- need for the stubs, we couldn't make the stub headers public without
- making this public too. */
-
--typedef struct trivfs_protid *trivfs_protid_t;
--typedef struct trivfs_control *trivfs_control_t;
--
++/* Type-aliases for mig. */
+ typedef struct trivfs_protid *trivfs_protid_t;
+ typedef struct trivfs_control *trivfs_control_t;
+
-struct trivfs_protid *_trivfs_begin_using_protid (mach_port_t);
-void _trivfs_end_using_protid (struct trivfs_protid *);
-struct trivfs_control *_trivfs_begin_using_control (mach_port_t);