hrev51093 adds 2 changesets to branch 'master'
old head: 743088d40bbb74fe7e5aa0c0ec91718f30e22323
new head: 5bb8320035e94928e81fa431a26919c6a68c42c5
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=5bb8320035e9+%5E743088d40bbb
----------------------------------------------------------------------------
6caa391f6787: Fix another use of PAGE_SIZE
Not detected when building locally, probably I should have done a clean
build.
5bb8320035e9: Fix a few more uses of PAGE_SIZE
[ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
4 files changed, 5 insertions(+), 5 deletions(-)
src/add-ons/kernel/bus_managers/firewire/fwohci.cpp | 2 +-
src/add-ons/kernel/drivers/audio/echo/generic/CDaffyDuck.cpp | 4 ++--
src/libs/compat/freebsd_network/Jamfile | 2 +-
src/libs/compat/freebsd_network/compat.c | 2 +-
############################################################################
Commit: 6caa391f678793b203d3e4e33f80fdbd82339cb3
URL: http://cgit.haiku-os.org/haiku/commit/?id=6caa391f6787
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Fri Apr 14 05:18:38 2017 UTC
Fix another use of PAGE_SIZE
Not detected when building locally, probably I should have done a clean
build.
----------------------------------------------------------------------------
diff --git a/src/libs/compat/freebsd_network/compat.c
b/src/libs/compat/freebsd_network/compat.c
index f745e11..3b40c9f 100644
--- a/src/libs/compat/freebsd_network/compat.c
+++ b/src/libs/compat/freebsd_network/compat.c
@@ -609,7 +609,7 @@ _kernel_malloc(size_t size, int flags)
// size. While it also states that this shouldn't be relied upon, at
least
// bus_dmamem_alloc expects it and drivers may depend on it as well.
void *ptr
- = memalign(size >= PAGE_SIZE ? PAGE_SIZE :
next_power_of_2(size), size);
+ = memalign(size >= PAGESIZE ? PAGESIZE : next_power_of_2(size),
size);
if (ptr == NULL)
return NULL;
############################################################################
Revision: hrev51093
Commit: 5bb8320035e94928e81fa431a26919c6a68c42c5
URL: http://cgit.haiku-os.org/haiku/commit/?id=5bb8320035e9
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Fri Apr 14 05:23:23 2017 UTC
Fix a few more uses of PAGE_SIZE
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/bus_managers/firewire/fwohci.cpp
b/src/add-ons/kernel/bus_managers/firewire/fwohci.cpp
index 8a69683..04ae2d2 100644
--- a/src/add-ons/kernel/bus_managers/firewire/fwohci.cpp
+++ b/src/add-ons/kernel/bus_managers/firewire/fwohci.cpp
@@ -150,7 +150,7 @@ static void fwohci_task_dma(void *);
/*
* memory allocated for DMA programs
*/
-#define DMA_PROG_ALLOC (8 * PAGE_SIZE)
+#define DMA_PROG_ALLOC (8 * B_PAGE_SIZE)
#define NDB FWMAXQUEUE
diff --git a/src/add-ons/kernel/drivers/audio/echo/generic/CDaffyDuck.cpp
b/src/add-ons/kernel/drivers/audio/echo/generic/CDaffyDuck.cpp
index ec4f1b4..d332cc6 100644
--- a/src/add-ons/kernel/drivers/audio/echo/generic/CDaffyDuck.cpp
+++ b/src/add-ons/kernel/drivers/audio/echo/generic/CDaffyDuck.cpp
@@ -111,7 +111,7 @@ CDaffyDuck::~CDaffyDuck()
{
if (NULL != m_pDuckPage)
- m_pOsSupport->FreePhysPageBlock( PAGE_SIZE, m_pDuckPage);
+ m_pOsSupport->FreePhysPageBlock( B_PAGE_SIZE, m_pDuckPage);
} // CDaffyDuck::~CDaffyDuck()
@@ -823,7 +823,7 @@ CDaffyDuck * CDaffyDuck::MakeDaffyDuck(COsSupport
*pOsSupport)
PHYS_ADDR PhysAddr;
PPAGE_BLOCK pPageBlock;
- Status = pOsSupport->AllocPhysPageBlock( PAGE_SIZE, pPageBlock);
+ Status = pOsSupport->AllocPhysPageBlock( B_PAGE_SIZE, pPageBlock);
if (ECHOSTATUS_OK != Status)
{
ECHO_DEBUGPRINTF(("CDaffyDuck::CDaffyDuck - duck entry page
block malloc failed\n"));
diff --git a/src/libs/compat/freebsd_network/Jamfile
b/src/libs/compat/freebsd_network/Jamfile
index fff177a..3d7b496 100644
--- a/src/libs/compat/freebsd_network/Jamfile
+++ b/src/libs/compat/freebsd_network/Jamfile
@@ -10,7 +10,7 @@ UseHeaders $(HAIKU_PRIVATE_KERNEL_HEADERS) : true ;
Includes [ FGristFiles kernel_c++_structs.h ]
: <src!system!kernel>kernel_c++_struct_sizes.h ;
-SubDirCcFlags [ FDefines _KERNEL=1 ] ;
+SubDirCcFlags [ FDefines _KERNEL=1 _XOPEN_SOURCE ] ;
KernelStaticLibrary libfreebsd_network.a :
bus.cpp