[PATCH 3/7] libtrivfs: include the mig-generated server headers in demuxer.c

[Justus Winter]

GNU MIG recently gained support for emitting x_server_routine
declarations in the generated server header file.  Using this
declaration, the x_server_routine functions can be inlined into the
demuxer function.

* libtrivfs/demuxer.c: Include the mig-generated server headers.
---
 libtrivfs/demuxer.c |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/libtrivfs/demuxer.c b/libtrivfs/demuxer.c
index 411699f..306cd11 100644
--- a/libtrivfs/demuxer.c
+++ b/libtrivfs/demuxer.c
@@ -21,17 +21,16 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 
02139, USA.  */
 
 #include "priv.h"
 
+#include "trivfs_io_S.h"
+#include "trivfs_fs_S.h"
+#include "../libports/notify_S.h"
+#include "trivfs_fsys_S.h"
+#include "../libports/interrupt_S.h"
+
 int
 trivfs_demuxer (mach_msg_header_t *inp,
                mach_msg_header_t *outp)
 {
-  mig_routine_t trivfs_io_server_routine (mach_msg_header_t *);
-  mig_routine_t trivfs_fs_server_routine (mach_msg_header_t *);
-  mig_routine_t ports_notify_server_routine (mach_msg_header_t *);
-  mig_routine_t trivfs_fsys_server_routine (mach_msg_header_t *);
-  mig_routine_t ports_interrupt_server_routine (mach_msg_header_t *);
-  mig_routine_t trivfs_ifsock_server_routine (mach_msg_header_t *);
-
   mig_routine_t routine;
   if ((routine = trivfs_io_server_routine (inp)) ||
       (routine = trivfs_fs_server_routine (inp)) ||
-- 
1.7.10.4