Browse Source

stdafx: include C++ algorithm header early and use std::min and std::max so gdiplus.h will have min and max to use after Bug 830801 was landed goanna3.

master
roytam1 7 months ago
parent
commit
eab5b3585c
  1. 9
      k-meleon/app/StdAfx.h

9
k-meleon/app/StdAfx.h

@ -64,8 +64,11 @@
#define NS_ARRAY_LENGTH(array_) \
(sizeof(array_)/sizeof(array_[0]))
#include <mozilla/Char16.h>
#include <algorithm>
using std::min; using std::max;
#include <afxwin.h> // MFC core and standard components
#include <afxext.h> // MFC extensions
#include <afxdisp.h> // Classes MFC Automation
@ -80,10 +83,6 @@
#include <afxtoolbar.h>
#include <afxframewndex.h>
#undef min
#undef max
#include <algorithm>
#ifdef _UNICODE
#if defined _M_IX86
#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")

Loading…
Cancel
Save