From 6ecc270f57931536803c747feb5a680f11a7595f Mon Sep 17 00:00:00 2001
From: John Scipione <jscipione@gmail.com>
Date: Fri, 4 Apr 2014 15:03:03 -0400
Subject: [PATCH] LayoutUtils: Use std::max instead of max_c

---
 src/kits/interface/LayoutUtils.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/kits/interface/LayoutUtils.cpp b/src/kits/interface/LayoutUtils.cpp
index e852a9b89f..f23eaa848c 100644
--- a/src/kits/interface/LayoutUtils.cpp
+++ b/src/kits/interface/LayoutUtils.cpp
@@ -5,6 +5,7 @@
 
 #include <LayoutUtils.h>
 
+#include <algorithm>
 #include <typeinfo>
 
 #include <Layout.h>
@@ -191,7 +192,7 @@ BLayoutUtils::AlignInFrame(BView* view, BRect frame)
 		float preferredHeight;
 		view->GetHeightForWidth(frame.Width(), &minHeight, &maxHeight,
 			&preferredHeight);
-		frame.bottom = frame.top + max_c(frame.Height(), minHeight);
+		frame.bottom = frame.top + std::max(frame.Height(), minHeight);
 		maxSize.height = minHeight;
 	}
 	frame = AlignInFrame(frame, maxSize, alignment);