hrev54640 adds 1 changeset to branch 'master'
old head: c12c97a6f1edb8197f09e636be76de36a6855fb9
new head: e6076c6d2e663f143fbaa312b52fd031d1a628b3
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=e6076c6d2e66+%5Ec12c97a6f1ed
----------------------------------------------------------------------------
e6076c6d2e66: freebsd_network: Define _KERNEL for C++ files too.
This also allows the removal of a function that is also in the cpufunc.h
header.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54640
Commit: e6076c6d2e663f143fbaa312b52fd031d1a628b3
URL: https://git.haiku-os.org/haiku/commit/?id=e6076c6d2e66
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Mon Oct 12 00:36:41 2020 UTC
----------------------------------------------------------------------------
2 files changed, 1 insertion(+), 12 deletions(-)
src/libs/compat/freebsd_network/Jamfile | 1 +
src/libs/compat/freebsd_network/bus.cpp | 12 ------------
----------------------------------------------------------------------------
diff --git a/src/libs/compat/freebsd_network/Jamfile
b/src/libs/compat/freebsd_network/Jamfile
index 74b757c41a..88544372fb 100644
--- a/src/libs/compat/freebsd_network/Jamfile
+++ b/src/libs/compat/freebsd_network/Jamfile
@@ -11,6 +11,7 @@ Includes [ FGristFiles kernel_c++_structs.h ]
: <src!system!kernel>kernel_c++_struct_sizes.h ;
SubDirCcFlags [ FDefines _KERNEL=1 ] ;
+SubDirC++Flags [ FDefines _KERNEL=1 ] ;
KernelStaticLibrary libfreebsd_network.a :
bus.cpp
diff --git a/src/libs/compat/freebsd_network/bus.cpp
b/src/libs/compat/freebsd_network/bus.cpp
index eedd8e6686..baa495cf46 100644
--- a/src/libs/compat/freebsd_network/bus.cpp
+++ b/src/libs/compat/freebsd_network/bus.cpp
@@ -62,18 +62,6 @@ struct internal_intr {
static int32 intr_wrapper(void *data);
-static int
-fls(int mask)
-{
- int bit;
- if (mask == 0)
- return (0);
- for (bit = 1; mask != 1; bit++)
- mask = (unsigned int)mask >> 1;
- return (bit);
-}
-
-
static area_id
map_mem(void **virtualAddr, phys_addr_t _phy, size_t size, uint32 protection,
const char *name)
