Merge to XFA: Switch most min/max macros to std::min/max.

core/include/fxcrt/fx_system.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_INCLUDE_FXCRT_FX_SYSTEM_H_
 #define CORE_INCLUDE_FXCRT_FX_SYSTEM_H_
 
 #include <assert.h>
@@ skipping 92 matching lines @@
 
 #define FXSYS_assert assert
 #ifndef ASSERT
 #ifdef _DEBUG
 #define ASSERT FXSYS_assert
 #else
 #define ASSERT(a)
 #endif
 #endif
 
-#define FX_MAX(a, b) (((a) > (b)) ? (a) : (b))
 #define FX_MIN(a, b) (((a) < (b)) ? (a) : (b))
 #define FX_PI 3.1415926535897932384626433832795f
 
 // NOTE: prevent use of the return value from snprintf() since some platforms
 // have different return values (e.g. windows _vsnprintf()), and provide
 // versions that always NUL-terminate.
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ && _MSC_VER < 1900
 void FXSYS_snprintf(char* str,
                     size_t size,
                     _Printf_format_string_ const char* fmt,
@@ skipping 188 matching lines @@
 
 // Prevent a function from ever being inlined, typically because we'd
 // like it to appear in stack traces.
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 #define NEVER_INLINE __declspec(noinline)
 #else  // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 #define NEVER_INLINE __attribute__((__noinline__))
 #endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 
 #endif  // CORE_INCLUDE_FXCRT_FX_SYSTEM_H_