From b8a9276a8976ba64580fa8d1507d1328122f662a Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 4 Apr 2005 21:47:36 +0000 Subject: [PATCH] Simplified the include paths by fine-tuning what is included. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12241 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/libroot/posix/math/Jamfile | 10 ---------- src/kernel/libroot/posix/math/ceilf.c | 4 ++-- src/kernel/libroot/posix/math/floorf.c | 4 ++-- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/kernel/libroot/posix/math/Jamfile b/src/kernel/libroot/posix/math/Jamfile index 799c7d93a8..ff5a21e8aa 100644 --- a/src/kernel/libroot/posix/math/Jamfile +++ b/src/kernel/libroot/posix/math/Jamfile @@ -1,16 +1,6 @@ SubDir OBOS_TOP src kernel libroot posix math ; -SubDirHdrs [ FDirName $(OBOS_TOP) headers posix ] ; - # even if this looks redundant, it's needed so that posix/math.h is - # still the first choice (there are files with the same name in - # glibc's includes. - # ToDo: The best solution would probably be to restrict the additional - # header includes to ceilf.c and floorf.c, as they are the only users - SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) glibc ] ; -SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) glibc include ] ; -SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) glibc include arch $(OBOS_ARCH) ] ; -SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) glibc math ] ; KernelMergeObject posix_math.o : acosh.c diff --git a/src/kernel/libroot/posix/math/ceilf.c b/src/kernel/libroot/posix/math/ceilf.c index 11d9a5d18f..bf1b0c9aad 100644 --- a/src/kernel/libroot/posix/math/ceilf.c +++ b/src/kernel/libroot/posix/math/ceilf.c @@ -13,8 +13,8 @@ * ==================================================== */ -#include "math.h" -#include "math_private.h" +#include +#include "math/math_private.h" static const float sHuge = 1.0e30; diff --git a/src/kernel/libroot/posix/math/floorf.c b/src/kernel/libroot/posix/math/floorf.c index a2c7d7b344..cf42b04fc9 100644 --- a/src/kernel/libroot/posix/math/floorf.c +++ b/src/kernel/libroot/posix/math/floorf.c @@ -24,8 +24,8 @@ #include -#include "math.h" -#include "math_private.h" +#include +#include "math/math_private.h" static const float sHuge = 1.0e30;