From 8a19a29283f4d51b2bf8a73be3ec1c14629a9a59 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 14 Oct 2024 13:00:46 -0400 Subject: [PATCH] FAT: Remove some unused macros and #ifndef around the remaining ones. Also adjust header paths order so the FAT compatibility headers always come before system ones. --- src/add-ons/kernel/file_systems/fat/Jamfile | 6 +++--- src/add-ons/kernel/file_systems/fat/bsd/sys/param.h | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/add-ons/kernel/file_systems/fat/Jamfile b/src/add-ons/kernel/file_systems/fat/Jamfile index 1f49ebec6a..277d3a671c 100644 --- a/src/add-ons/kernel/file_systems/fat/Jamfile +++ b/src/add-ons/kernel/file_systems/fat/Jamfile @@ -1,12 +1,12 @@ SubDir HAIKU_TOP src add-ons kernel file_systems fat ; +local commonSource ; +include [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems fat JamCommon ] ; + UsePrivateKernelHeaders ; UsePrivateHeaders shared storage file_systems ; UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ; -local commonSource ; -include [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems fat JamCommon ] ; - KernelAddon fat : $(commonSource) mime_ext_table.c diff --git a/src/add-ons/kernel/file_systems/fat/bsd/sys/param.h b/src/add-ons/kernel/file_systems/fat/bsd/sys/param.h index 0f7f58ec1c..50a3553408 100644 --- a/src/add-ons/kernel/file_systems/fat/bsd/sys/param.h +++ b/src/add-ons/kernel/file_systems/fat/bsd/sys/param.h @@ -71,11 +71,15 @@ #define EJUSTRETURN (-2) /* don't modify regs, just return */ /* Macros for counting and rounding. */ +#ifndef rounddown #define rounddown(x, y) (((x) / (y)) * (y)) -#define rounddown2(x, y) __align_down(x, y) /* if y is power of two */ +#endif +#ifndef roundup #define roundup(x, y) ((((x) + ((y) -1)) / (y)) * (y)) /* to any y */ -#define roundup2(x, y) __align_up(x, y) /* if y is powers of two */ +#endif +#ifndef powerof2 #define powerof2(x) ((((x) -1) & (x)) == 0) +#endif #endif // FAT_PARAM_H