From 04b7652feade60e83dbced7447f1f142efdbb736 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sun, 7 Apr 2013 05:15:22 +0000 Subject: [PATCH] NetworkSetup: Build fix. max vs max_c * max can only be used in C apps. C++ apps use max_c --- .../kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp b/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp index 9d94011380..6f38243193 100644 --- a/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp +++ b/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -224,7 +225,7 @@ InterfaceListItem::Update(BView* owner, const BFont* font) fSecondlineOffset = fFirstlineOffset + lineHeight; fThirdlineOffset = fFirstlineOffset + (lineHeight * 2); - SetHeight(max(3 * lineHeight + 4, fIcon->Bounds().Height() + 8)); + SetHeight(max_c(3 * lineHeight + 4, fIcon->Bounds().Height() + 8)); // either to the text height or icon height, whichever is taller }