Skip to content

Commit b42999a

Browse files
committed
chore: split platform code per translation unit
1 parent d3ca1e0 commit b42999a

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

src/datadog/platform_util_unix.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<<<<<<<< HEAD:src/datadog/platform_util_unix.cpp
12
#include <errno.h>
23
#include <fcntl.h>
34
#include <pthread.h>
@@ -276,3 +277,12 @@ Optional<ContainerID> get_id() {
276277

277278
} // namespace tracing
278279
} // namespace datadog
280+
========
281+
#ifdef _MSC_VER
282+
#include "platform_util_windows.cpp"
283+
#elif defined(__APPLE__) || defined(__FreeBSD__)
284+
#include "platform_util_darwin.cpp"
285+
#else
286+
#include "platform_util_unix.cpp"
287+
#endif
288+
>>>>>>>> de34fe8 (chore: split platform code per translation unit):src/datadog/platform_util.cpp

src/datadog/platform_util_windows.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ std::tuple<std::string, std::string> get_windows_info() {
2121
// application manifest, which is the lowest version supported by the
2222
// application. Use `RtlGetVersion` to obtain the accurate OS version
2323
// regardless of the manifest.
24-
using RtlGetVersion = auto(*)(LPOSVERSIONINFOEXW)->NTSTATUS;
24+
using RtlGetVersion = auto (*)(LPOSVERSIONINFOEXW)->NTSTATUS;
2525

2626
RtlGetVersion func =
2727
(RtlGetVersion)GetProcAddress(GetModuleHandleA("ntdll"), "RtlGetVersion");

0 commit comments

Comments
 (0)