Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit a8d0e69

Browse filesBrowse files
tordextordex
authored
Merge pull request litehtml#299 from stasoid/master
fix min/max compilation errors on Windows
2 parents 0117a44 + 82982bf commit a8d0e69
Copy full SHA for a8d0e69

File tree

Expand file treeCollapse file tree

5 files changed

+5
-2
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+5
-2
lines changed

‎containers/cairo/cairo_container.h

Copy file name to clipboardExpand all lines: containers/cairo/cairo_container.h
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#pragma once
2+
#define NOMINMAX
23
#include <windows.h>
34
#include <mlang.h>
45
#include <stdlib.h>

‎containers/cairo/cairo_font.h

Copy file name to clipboardExpand all lines: containers/cairo/cairo_font.h
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#pragma once
22

3+
#define NOMINMAX
34
#include <windows.h>
45
#include <stdlib.h>
56
#include <malloc.h>

‎containers/gdiplus/gdiplus_container.cpp

Copy file name to clipboardExpand all lines: containers/gdiplus/gdiplus_container.cpp
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#define NOMINMAX
12
#include <windows.h>
23
#include <gdiplus.h>
34
#include "gdiplus_container.h"

‎containers/win32/win32_container.h

Copy file name to clipboardExpand all lines: containers/win32/win32_container.h
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#pragma once
2+
#define NOMINMAX
23
#include <windows.h>
34
#include <set>
45
#include <litehtml.h>

‎test/render_test.cpp

Copy file name to clipboardExpand all lines: test/render_test.cpp
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
#include <gtest/gtest.h>
33
#include <fstream>
44
#ifdef _WIN32
5+
#define NOMINMAX
56
#include "dirent.h"
6-
#undef min
7-
#undef max
87
#else
98
#include <dirent.h>
109
#endif

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.