Prepare for new p/invoke code, step #2

grendello · grendello · commit 67b7a34b2476 · 2024-07-31T10:20:47.000+02:00
diff --git a/src/native/monodroid/CMakeLists.txt b/src/native/monodroid/CMakeLists.txt
@@ -60,7 +60,6 @@ set(XAMARIN_MONODROID_SOURCES
   monodroid-tracing.cc
   monovm-properties.cc
   osbridge.cc
-  pinvoke-override-api.cc
   runtime-util.cc
   timezones.cc
   xamarin_getifaddrs.cc
diff --git a/src/native/monodroid/pinvoke-override-api.cc b/src/native/monodroid/pinvoke-override-api.cc
diff --git a/src/native/runtime-base/monodroid-dl.hh b/src/native/runtime-base/monodroid-dl.hh
@@ -19,7 +19,11 @@ namespace xamarin::android::internal
 {
 	class MonodroidDl
 	{
+<<<<<<< HEAD
 		static inline xamarin::android::mutex   dso_handle_write_lock;
+=======
+		static inline std::mutex   dso_handle_write_lock;
+>>>>>>> 0c9fc0626 (Prepare for new p/invoke code, step #2)
 
 		static unsigned int convert_dl_flags (int flags) noexcept
 		{

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,11 @@ namespace xamarin::android::internal`
`19`	`19`	`{`
`20`	`20`	`class MonodroidDl`
`21`	`21`	`{`
	`22`	`+<<<<<<< HEAD`
`22`	`23`	`static inline xamarin::android::mutex dso_handle_write_lock;`
	`24`	`+=======`
	`25`	`+ static inline std::mutex dso_handle_write_lock;`
	`26`	`+>>>>>>> 0c9fc0626 (Prepare for new p/invoke code, step #2)`
`23`	`27`
`24`	`28`	`static unsigned int convert_dl_flags (int flags) noexcept`
`25`	`29`	`{`