]> git.proxmox.com Git - ceph.git/blob - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/field3d/0002_improve_win_compatibility.patch
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / field3d / 0002_improve_win_compatibility.patch
1 diff --git a/include/UtilFoundation.h b/include/UtilFoundation.h
2 index 2eb6290..a449b5b 100644
3 --- a/include/UtilFoundation.h
4 +++ b/include/UtilFoundation.h
5 @@ -90,6 +90,9 @@
6 #ifndef WIN32_LEAN_AND_MEAN
7 #define WIN32_LEAN_AND_MEAN
8 #endif
9 +#ifndef NOMINMAX
10 +#define NOMINMAX
11 +#endif
12
13 // needed for mutex stuff
14 #include <Windows.h>
15 diff --git a/src/FieldMapping.cpp b/src/FieldMapping.cpp
16 index b1f1a1f..90612b1 100644
17 --- a/src/FieldMapping.cpp
18 +++ b/src/FieldMapping.cpp
19 @@ -49,9 +49,6 @@
20 #include "FieldMapping.h"
21 #include "Types.h"
22
23 -#ifdef WIN32
24 -#define isnan(__x__) _isnan(__x__)
25 -#endif
26
27 //----------------------------------------------------------------------------//
28
29 diff --git a/src/Log.cpp b/src/Log.cpp
30 index f78229c..d095a50 100644
31 --- a/src/Log.cpp
32 +++ b/src/Log.cpp
33 @@ -40,8 +40,9 @@
34 */
35
36 //----------------------------------------------------------------------------//
37 -
38 +#ifndef _WIN32
39 #include <unistd.h>
40 +#endif
41 #include <ios>
42 #include <fstream>
43