diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-22 01:55:47 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-22 01:55:47 +0000 |
| commit | c0c35f90e218835ef0f8c0b67399ad6533763ed0 (patch) | |
| tree | 170c7320a73a56864c1f0e69324071b93420227e /libmachdev | |
| parent | 871cd76365ed6ef9fa89282e31e21f20d6c1db62 (diff) | |
| parent | 258642ef93bda485b8904cfe47ab34644247229e (diff) | |
Merge branch 'dde-clean' into upstream-merged
Diffstat (limited to 'libmachdev')
| -rw-r--r-- | libmachdev/Makefile | 4 | ||||
| -rw-r--r-- | libmachdev/if_hdr.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libmachdev/Makefile b/libmachdev/Makefile index 15bc9730..ad090cae 100644 --- a/libmachdev/Makefile +++ b/libmachdev/Makefile @@ -25,13 +25,11 @@ LCLHDRS = dev_hdr.h device_emul.h ds_routines.h vm_param.h \ util.h queue.h io_req.h if_ether.h machdev.h linux-errno.h \ errno-base.h installhdrs = machdev.h -HURDLIBS = ports threads trivfs +HURDLIBS = ports threads trivfs ddekit bpf OBJS = $(SRCS:.c=.o) $(MIGSTUBS) include ../Makeconf -CFLAGS += -I$(top_srcdir)/libddekit/include -I$(top_srcdir)/libbpf - ourdevice.defs: device.defs $(CPP) $(CPPFLAGS) -x c $< | sed -e '/out[ ]*device[ ]*:[ ]*device_t/s/device_t/mach_port_send_t/' > $@ diff --git a/libmachdev/if_hdr.h b/libmachdev/if_hdr.h index 74d0fa8a..32497206 100644 --- a/libmachdev/if_hdr.h +++ b/libmachdev/if_hdr.h @@ -62,7 +62,7 @@ #include <queue.h> #include <cthreads.h> -#include <bpf_impl.h> +#include <hurd/bpf_impl.h> #if 0 /* |