From 70bc652f19ff9dfc523856a6808eba6a5770a643 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Boric Date: Mon, 14 Nov 2016 13:58:45 +0100 Subject: [PATCH] fix common libraries --- common/lib/libc/Makefile.inc | 4 ---- common/lib/libprop/prop_dictionary.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/common/lib/libc/Makefile.inc b/common/lib/libc/Makefile.inc index 54652a6d2..ca8070599 100644 --- a/common/lib/libc/Makefile.inc +++ b/common/lib/libc/Makefile.inc @@ -3,11 +3,7 @@ .include COMMON_DIR:=${.PARSEDIR} -.if defined(__MINIX) -COMMON_CODEDIRS=atomic gen inet md net stdlib string -.else COMMON_CODEDIRS=atomic gen gmon inet md net stdlib string sys -.endif COMMON_CODEDIRS+=hash/sha1 hash/sha2 hash/rmd160 hash/murmurhash .if defined(COMMON_MACHINE_ARCH) && !empty(COMMON_MACHINE_ARCH) && \ diff --git a/common/lib/libprop/prop_dictionary.c b/common/lib/libprop/prop_dictionary.c index 151b39cd6..bb79232af 100644 --- a/common/lib/libprop/prop_dictionary.c +++ b/common/lib/libprop/prop_dictionary.c @@ -655,7 +655,7 @@ static void _prop_dictionary_iterator_reset(void *v) { struct _prop_dictionary_iterator *pdi = v; -#if defined(__minix) && defined(_REENTRANT) +#if defined(__minix) && defined(_REENTRANT) || defined(_KERNEL) prop_dictionary_t pd _PROP_ARG_UNUSED = pdi->pdi_base.pi_obj; #endif /* defined(__minix) && defined(_REENTRANT) */