Re: [PATCH] Use DEVICE_IMPORTS to include libports/ports.h

[Flavio Cruz]

On Thu, Dec 31, 2015 at 04:28:14PM +0100, Justus Winter wrote:
> Quoting Samuel Thibault (2015-12-31 16:11:30)
> > Flavio Cruz, on Thu 31 Dec 2015 15:56:31 +0100, wrote:
> > > This fixes three compiler warnings about ports_payload_get_name.
> > > 
> > > * devnode/Makefile: Define DEVICE_IMPORTS.
> > > * term/Makefile: Likewise.
> > > * trans/Makefile: Likewise.
> > 
> > Why not adding them to the corresponding mig-mutate.h?
> 
> Sometimes we don't have a mig-mutate.h, e.g. for most (all?)
> translators in trans/.  I prefer stuffing that in a .h as well, but I
> wouldn't be opposed to just applying the patch, as we use both ways of
> mutating the mig types.

Agreed. I think only devnode should include it in mig-mutate.h. For
term, only some stubs are including mig-mutate.h. For trans, there's no
mig-mutate.h at all.  Here's the modified patch.

---

diff --git a/devnode/mig-mutate.h b/devnode/mig-mutate.h
index 0656014..b7a9ed6 100644
--- a/devnode/mig-mutate.h
+++ b/devnode/mig-mutate.h
@@ -25,3 +25,5 @@
   end_using_port_info (port_info_t)
 #define NOTIFY_IMPORTS                                         \
   import "libports/mig-decls.h";
+#define DEVICE_IMPORTS                                         \
+  import "libports/ports.h";
diff --git a/term/Makefile b/term/Makefile
index 1419d2a..7876604 100644
--- a/term/Makefile
+++ b/term/Makefile
@@ -33,6 +33,8 @@ include ../Makeconf
 
 device_replyServer-CPPFLAGS = -DTypeCheck=0 -Wno-unused # XXX
 
-device_reply-MIGSFLAGS = -DMACH_PAYLOAD_TO_PORT=ports_payload_get_name
+device_reply-MIGSFLAGS=\
+    "-DMACH_PAYLOAD_TO_PORT=ports_payload_get_name" \
+    "-DDEVICE_IMPORTS=import \"$(srcdir)/../libports/ports.h\";"
 tioctl-MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h
 term-MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h
diff --git a/trans/Makefile b/trans/Makefile
index 2fdcd38..65b51d1 100644
--- a/trans/Makefile
+++ b/trans/Makefile
@@ -45,7 +45,9 @@ ifsock-MIGSFLAGS=\
     "-DIFSOCK_IMPORTS=import \"../libtrivfs/mig-decls.h\";"
 
 # device_replyServer is used by the streamio translator.
-device_reply-MIGSFLAGS="-DMACH_PAYLOAD_TO_PORT=ports_payload_get_name"
+device_reply-MIGSFLAGS=\
+    "-DMACH_PAYLOAD_TO_PORT=ports_payload_get_name" \
+    "-DDEVICE_IMPORTS=import \"$(srcdir)/../libports/ports.h\";"
 
 # fsysServer is only used by the symlink translator which does not use
 # libports.  Disable the default payload to port conversion.