Skip to content

Commit 09ea6fa

Browse files
authored
Merge pull request KhronosGroup#2333 from 1480c1/mingw-w64
Common: include standard headers before doing any defines
2 parents 1ee5d1c + 8486b2e commit 09ea6fa

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

glslang/Include/Common.h

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,17 @@
3737
#ifndef _COMMON_INCLUDED_
3838
#define _COMMON_INCLUDED_
3939

40+
#include <algorithm>
41+
#include <cassert>
42+
#include <cstdio>
43+
#include <cstdlib>
44+
#include <list>
45+
#include <map>
46+
#include <set>
47+
#include <string>
48+
#include <unordered_map>
49+
#include <unordered_set>
50+
#include <vector>
4051

4152
#if defined(__ANDROID__) || (defined(_MSC_VER) && _MSC_VER < 1700)
4253
#include <sstream>
@@ -93,18 +104,6 @@ std::string to_string(const T& val) {
93104
#pragma warning(disable : 4201) // nameless union
94105
#endif
95106

96-
#include <set>
97-
#include <unordered_set>
98-
#include <vector>
99-
#include <map>
100-
#include <unordered_map>
101-
#include <list>
102-
#include <algorithm>
103-
#include <string>
104-
#include <cstdio>
105-
#include <cstdlib>
106-
#include <cassert>
107-
108107
#include "PoolAlloc.h"
109108

110109
//

0 commit comments

Comments
 (0)