From 8287b6ffdf2cb631591decb17429701218122259 Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Tue, 25 Feb 2014 01:01:09 +0100
Subject: libtrivfs: improve the mig mutator functions

Previously, the mig mutator functions were in migsupport.c, preventing
them from being inlined into the mig-generated server functions.  Put
them in mig-decls.h instead.  Rename mutations.h to mig-mutate.h.
This is the naming convention used for pflocal.

* libtrivfs/fsmutations.h: Rename to mig-mutate.h, adopt imports.
* libtrivfs/Makefile: Adopt accordingly.
* libtrivfs/migsupport.c: Rename to mig-decls.h.
* libtrivfs/trivfs.h: Move dynamic classes/buckets declarations to
mig-decls.h, remove superfluous imports.
* exec/execmutations.h: Fix import.
* pfinet/mig-mutate.h: Likewise.
* trans/Makefile: Likewise.
---
 pfinet/mig-mutate.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'pfinet')

diff --git a/pfinet/mig-mutate.h b/pfinet/mig-mutate.h
index 4d97408f..b7780776 100644
--- a/pfinet/mig-mutate.h
+++ b/pfinet/mig-mutate.h
@@ -28,7 +28,9 @@
 
 #define SOCKET_INTRAN sock_user_t begin_using_socket_port (socket_t)
 #define SOCKET_DESTRUCTOR end_using_socket_port (sock_user_t)
-#define SOCKET_IMPORTS import "mig-decls.h";
+#define SOCKET_IMPORTS				\
+  import "mig-decls.h";				\
+  import "../libtrivfs/mig-decls.h";		\
 
 #define ADDRPORT_INTRAN sock_addr_t begin_using_sockaddr_port (addr_port_t)
 #define ADDRPORT_DESTRUCTOR end_using_sockaddr_port (sock_addr_t)
-- 
cgit v1.2.3