Skip to content

Commit 8913e78

Browse files
committed
fix 2
1 parent e247e98 commit 8913e78

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

common/arg.cpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@
55
#include "sampling.h"
66
#include "chat.h"
77

8+
// fix problem with std::min and std::max
9+
#if defined(_WIN32)
10+
#define WIN32_LEAN_AND_MEAN
11+
#ifndef NOMINMAX
12+
# define NOMINMAX
13+
#endif
14+
#include <windows.h>
15+
#endif
16+
817
#include <algorithm>
918
#include <climits>
1019
#include <cstdarg>
@@ -23,14 +32,6 @@
2332
#include <future>
2433
#endif
2534

26-
// fix problem with std::min and std::max
27-
#if defined(_WIN32)
28-
#define WIN32_LEAN_AND_MEAN
29-
#ifndef NOMINMAX
30-
# define NOMINMAX
31-
#endif
32-
#endif
33-
3435
#include "json-schema-to-grammar.h"
3536

3637
using json = nlohmann::ordered_json;

0 commit comments

Comments
 (0)