Get rid of Linux transactions.

MarekKnapek · May 31, 2024 · 8125ac7 · 8125ac7
1 parent 41e86e1
commit 8125ac7
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 103 deletions.
diff --git a/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj b/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj
@@ -756,7 +756,6 @@
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_reader_file_portable.h"/>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_reader_file_windows.h"/>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_transaction.h"/>
-		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_transaction_linux.h"/>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_transaction_portable.h"/>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_transaction_windows.h"/>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_writer_buffered_inl_defd.h"/>
@@ -1233,7 +1232,6 @@
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_reader_file_portable.c"/>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_reader_file_windows.c"/>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_transaction.c"/>
-		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_transaction_linux.c"/>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_transaction_portable.c"/>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_transaction_windows.c"/>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_writer_file.c"/>

diff --git a/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj.filters b/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj.filters
@@ -719,7 +719,6 @@
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_reader_file_portable.h"><Filter>src</Filter></ClInclude>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_reader_file_windows.h"><Filter>src</Filter></ClInclude>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_transaction.h"><Filter>src</Filter></ClInclude>
-		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_transaction_linux.h"><Filter>src</Filter></ClInclude>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_transaction_portable.h"><Filter>src</Filter></ClInclude>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_transaction_windows.h"><Filter>src</Filter></ClInclude>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_writer_buffered_inl_defd.h"><Filter>src</Filter></ClInclude>
@@ -1196,7 +1195,6 @@
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_reader_file_portable.c"><Filter>src</Filter></ClCompile>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_reader_file_windows.c"><Filter>src</Filter></ClCompile>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_transaction.c"><Filter>src</Filter></ClCompile>
-		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_transaction_linux.c"><Filter>src</Filter></ClCompile>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_transaction_portable.c"><Filter>src</Filter></ClCompile>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_transaction_windows.c"><Filter>src</Filter></ClCompile>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_sl_io_writer_file.c"><Filter>src</Filter></ClCompile>

diff --git a/mk_clib/src/mk_sl_io_transaction.c b/mk_clib/src/mk_sl_io_transaction.c
@@ -15,14 +15,7 @@
 #define mk_sl_io_transaction_impl_abort  mk_sl_io_transaction_windows_abort
 #define mk_sl_io_transaction_impl_close  mk_sl_io_transaction_windows_close
 #define mk_sl_io_transaction_impl_dummy  mk_sl_io_transaction_windows_dummy
-#elif mk_lang_platform == mk_lang_platform_linux
-#include "mk_sl_io_transaction_linux.h"
-#define mk_sl_io_transaction_impl_create mk_sl_io_transaction_linux_create
-#define mk_sl_io_transaction_impl_commit mk_sl_io_transaction_linux_commit
-#define mk_sl_io_transaction_impl_abort  mk_sl_io_transaction_linux_abort
-#define mk_sl_io_transaction_impl_close  mk_sl_io_transaction_linux_close
-#define mk_sl_io_transaction_impl_dummy  mk_sl_io_transaction_linux_dummy
-#elif mk_lang_platform == mk_lang_platform_portable
+#elif mk_lang_platform == mk_lang_platform_linux || mk_lang_platform == mk_lang_platform_portable
 #include "mk_sl_io_transaction_portable.h"
 #define mk_sl_io_transaction_impl_create mk_sl_io_transaction_portable_create
 #define mk_sl_io_transaction_impl_commit mk_sl_io_transaction_portable_commit

diff --git a/mk_clib/src/mk_sl_io_transaction.h b/mk_clib/src/mk_sl_io_transaction.h
@@ -12,10 +12,7 @@
 #if mk_lang_platform == mk_lang_platform_windows_61 || mk_lang_platform == mk_lang_platform_windows_60 || mk_lang_platform == mk_lang_platform_windows
 #include "mk_sl_io_transaction_windows.h"
 struct mk_sl_io_transaction_s { mk_sl_io_transaction_windows_t m_data; };
-#elif mk_lang_platform == mk_lang_platform_linux
-#include "mk_sl_io_transaction_linux.h"
-struct mk_sl_io_transaction_s { mk_sl_io_transaction_linux_t m_data; };
-#elif mk_lang_platform == mk_lang_platform_portable
+#elif mk_lang_platform == mk_lang_platform_linux || mk_lang_platform == mk_lang_platform_portable
 #include "mk_sl_io_transaction_portable.h"
 struct mk_sl_io_transaction_s { mk_sl_io_transaction_portable_t m_data; };
 #else

diff --git a/mk_clib/src/mk_sl_io_transaction_linux.c b/mk_clib/src/mk_sl_io_transaction_linux.c
diff --git a/mk_clib/src/mk_sl_io_transaction_linux.h b/mk_clib/src/mk_sl_io_transaction_linux.h