Skip to content

Commit 98e83fa

Browse files
fix p/invoke on Linux (#364)
* split p/invoke method into Windows and Linux versions * export IsProfilerAttached() when compiling with gcc * Revert "split p/invoke method into Windows and Linux versions" This reverts commit e0be864. * fix shared library name in p/invoke so it works across platforms
1 parent 551c5ff commit 98e83fa

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/Datadog.Trace.ClrProfiler.Managed/NativeMethods.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace Datadog.Trace.ClrProfiler
44
{
55
internal static class NativeMethods
66
{
7-
[DllImport("Datadog.Trace.ClrProfiler.Native.dll")]
7+
[DllImport("Datadog.Trace.ClrProfiler.Native")]
88
public static extern bool IsProfilerAttached();
99
}
1010
}

src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ add_library("Datadog.Trace.ClrProfiler.Native.static" STATIC
1616
il_rewriter.cpp
1717
integration_loader.cpp
1818
integration.cpp
19-
interop.cpp
2019
logging.cpp
2120
metadata_builder.cpp
2221
miniutf.cpp
@@ -40,6 +39,7 @@ target_link_libraries("Datadog.Trace.ClrProfiler.Native.static"
4039

4140
add_library("Datadog.Trace.ClrProfiler.Native" SHARED
4241
dllmain.cpp
42+
interop.cpp
4343
)
4444
set_target_properties("Datadog.Trace.ClrProfiler.Native" PROPERTIES PREFIX "")
4545
target_link_libraries("Datadog.Trace.ClrProfiler.Native" "Datadog.Trace.ClrProfiler.Native.static")

0 commit comments

Comments
 (0)