[hurd] 10/25: devnode: remove the ourdevice hack

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch dde
in repository hurd.

commit d193d3e8e829b94c5cbe7c4725a7b125362f0840
Author: Justus Winter <address@hidden>
Date:   Fri Apr 11 21:43:39 2014 +0200

    devnode: remove the ourdevice hack
    
    Previously, the device definitions were filtered using sed to replace
    the device_t type with mach_port_send_t to make the device argument of
    device_open polymorphic.  Rather than doing that, which makes it
    impossible to use translation functions, the definition of device_open
    has been amended.
    
    * devnode/Makefile: Remove the ourdevice hack that changes
    device_t to mach_port_send_t.
    * devnode/devnode.c: Likewise.
---
 devnode/Makefile  | 5 +----
 devnode/devnode.c | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/devnode/Makefile b/devnode/Makefile
index 7b3c0bd..d9a9c23 100644
--- a/devnode/Makefile
+++ b/devnode/Makefile
@@ -22,11 +22,8 @@ SRCS = devnode.c
 LCLHDRS = util.h
 HURDLIBS = ports trivfs fshelp shouldbeinlibc
 target = devnode
-MIGSTUBS = ourdeviceServer.o notifyServer.o
+MIGSTUBS = deviceServer.o notifyServer.o
 MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h
 OBJS = $(SRCS:.c=.o) $(MIGSTUBS)
 
 include ../Makeconf
-
-ourdevice.defs: device.defs
-       $(CPP) $(CPPFLAGS) -x c $< | sed -e '/out[      ]*device[       ]*:[    
]*device_t/s/device_t/mach_port_send_t/' > $@
diff --git a/devnode/devnode.c b/devnode/devnode.c
index 61fc509..101675d 100644
--- a/devnode/devnode.c
+++ b/devnode/devnode.c
@@ -36,7 +36,7 @@
 #include <hurd/trivfs.h>
 #include <hurd/ports.h>
 
-#include "ourdevice_S.h"
+#include "device_S.h"
 #include "notify_S.h"
 #include "util.h"
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git