From 1f6d0a79c927877cdf2aa5a6c6475a2488090f5f Mon Sep 17 00:00:00 2001 From: Marcus Overhagen Date: Fri, 14 Sep 2012 20:20:29 +0200 Subject: [PATCH] use template max() instead of max_c() macro --- src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp b/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp index 0d7655aa9f..b5ed575812 100644 --- a/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp +++ b/src/add-ons/kernel/busses/scsi/ahci/ahci_controller.cpp @@ -6,6 +6,7 @@ #include "ahci_controller.h" #include "util.h" +#include #include #include #include @@ -281,7 +282,7 @@ AHCIController::ResetController() if (fPCIVendorID == PCI_VENDOR_INTEL) { // Intel PCS—Port Control and Status // SATA port enable bits must be set - int portCount = max_c(fls(fRegs->pi), 1 + (int)((fRegs->cap >> CAP_NP_SHIFT) & CAP_NP_MASK)); + int portCount = std::max(fls(fRegs->pi), 1 + (int)((fRegs->cap >> CAP_NP_SHIFT) & CAP_NP_MASK)); if (portCount > 8) { // TODO: fix this when specification available TRACE("don't know how to enable SATA ports 9 to %d\n", portCount);