[ros-diffs] [reactos] 01/06: [VCRUNTIME] Move compiler runtime headers into their own folder

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84344399b57b55f1a5832…

commit 84344399b57b55f1a58321f42d9515fd3e29ea91
Author:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Sat May 11 08:11:36 2024 +0300
Commit:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Sat Nov 2 12:52:59 2024 +0200

    [VCRUNTIME] Move compiler runtime headers into their own folder
    
    These headers come with the MS compiler. Some of them are standard, like emmintrin.h,
others are MS specific like crtdefs.h
    This separation will allow using MS CRT headers. Eventually it can allow compiling
with the compilers' runtime headers.
---
 CMakeLists.txt                                         | 1 +
 sdk/include/{crt => vcruntime}/_mingw.h                | 0
 sdk/include/{crt => vcruntime}/_mingw_mac.h            | 0
 sdk/include/{crt => vcruntime}/_mingw_unicode.h        | 0
 sdk/include/{crt => vcruntime}/armintr.h               | 0
 sdk/include/{crt => vcruntime}/comdef.h                | 0
 sdk/include/{crt => vcruntime}/comdefsp.h              | 0
 sdk/include/{crt => vcruntime}/comip.h                 | 0
 sdk/include/{crt => vcruntime}/comutil.h               | 0
 sdk/include/{crt => vcruntime}/crtdefs.h               | 0
 sdk/include/{crt => vcruntime}/eh.h                    | 0
 sdk/include/{crt => vcruntime}/emmintrin.h             | 0
 sdk/include/{crt => vcruntime}/excpt.h                 | 0
 sdk/include/{psdk => vcruntime}/gcc_sal.h              | 0
 sdk/include/{crt => vcruntime}/intrin.h                | 0
 sdk/include/{crt => vcruntime}/limits.h                | 0
 sdk/include/{crt => vcruntime}/mingw32/gcc_float.h     | 0
 sdk/include/{crt => vcruntime}/mingw32/intrin.h        | 0
 sdk/include/{crt => vcruntime}/mingw32/intrin_arm.h    | 0
 sdk/include/{crt => vcruntime}/mingw32/intrin_ppc.h    | 0
 sdk/include/{crt => vcruntime}/mingw32/intrin_x86.h    | 0
 sdk/include/{crt => vcruntime}/mingw32/intrin_x86_64.h | 0
 sdk/include/{crt => vcruntime}/mmintrin.h              | 0
 sdk/include/{psdk => vcruntime}/ms_sal.h               | 0
 sdk/include/{crt => vcruntime}/msc/intrin.h            | 0
 sdk/include/{crt => vcruntime}/msc/msc_float.h         | 0
 sdk/include/{crt => vcruntime}/pgobootrun.h            | 0
 sdk/include/{crt => vcruntime}/rtcapi.h                | 0
 sdk/include/{psdk => vcruntime}/sal.h                  | 0
 sdk/include/{crt => vcruntime}/setjmp.h                | 0
 sdk/include/{crt => vcruntime}/setjmpex.h              | 0
 sdk/include/{crt => vcruntime}/stdarg.h                | 0
 sdk/include/{crt => vcruntime}/stdbool.h               | 0
 sdk/include/{crt => vcruntime}/stdint.h                | 0
 sdk/include/{crt => vcruntime}/vadefs.h                | 0
 sdk/include/{crt => vcruntime}/varargs.h               | 0
 sdk/include/{crt => vcruntime}/xmmintrin.h             | 0
 sdk/include/{crt => vcruntime}/ymath.h                 | 0
 sdk/include/wdf/kmdf/1.17/wdf.h                        | 2 +-
 39 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bb54f893eb..063ea4d060d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -319,6 +319,7 @@ Enable this if the module uses typeid or dynamic_cast. You will
probably need to
         ${REACTOS_BINARY_DIR}/sdk/include/reactos
         ${REACTOS_BINARY_DIR}/sdk/include/reactos/mc
         sdk/include/crt
+        sdk/include/vcruntime
         sdk/include/ddk
         sdk/include/ndk
         sdk/include/reactos
diff --git a/sdk/include/crt/_mingw.h b/sdk/include/vcruntime/_mingw.h
similarity index 100%
rename from sdk/include/crt/_mingw.h
rename to sdk/include/vcruntime/_mingw.h
diff --git a/sdk/include/crt/_mingw_mac.h b/sdk/include/vcruntime/_mingw_mac.h
similarity index 100%
rename from sdk/include/crt/_mingw_mac.h
rename to sdk/include/vcruntime/_mingw_mac.h
diff --git a/sdk/include/crt/_mingw_unicode.h b/sdk/include/vcruntime/_mingw_unicode.h
similarity index 100%
rename from sdk/include/crt/_mingw_unicode.h
rename to sdk/include/vcruntime/_mingw_unicode.h
diff --git a/sdk/include/crt/armintr.h b/sdk/include/vcruntime/armintr.h
similarity index 100%
rename from sdk/include/crt/armintr.h
rename to sdk/include/vcruntime/armintr.h
diff --git a/sdk/include/crt/comdef.h b/sdk/include/vcruntime/comdef.h
similarity index 100%
rename from sdk/include/crt/comdef.h
rename to sdk/include/vcruntime/comdef.h
diff --git a/sdk/include/crt/comdefsp.h b/sdk/include/vcruntime/comdefsp.h
similarity index 100%
rename from sdk/include/crt/comdefsp.h
rename to sdk/include/vcruntime/comdefsp.h
diff --git a/sdk/include/crt/comip.h b/sdk/include/vcruntime/comip.h
similarity index 100%
rename from sdk/include/crt/comip.h
rename to sdk/include/vcruntime/comip.h
diff --git a/sdk/include/crt/comutil.h b/sdk/include/vcruntime/comutil.h
similarity index 100%
rename from sdk/include/crt/comutil.h
rename to sdk/include/vcruntime/comutil.h
diff --git a/sdk/include/crt/crtdefs.h b/sdk/include/vcruntime/crtdefs.h
similarity index 100%
rename from sdk/include/crt/crtdefs.h
rename to sdk/include/vcruntime/crtdefs.h
diff --git a/sdk/include/crt/eh.h b/sdk/include/vcruntime/eh.h
similarity index 100%
rename from sdk/include/crt/eh.h
rename to sdk/include/vcruntime/eh.h
diff --git a/sdk/include/crt/emmintrin.h b/sdk/include/vcruntime/emmintrin.h
similarity index 100%
rename from sdk/include/crt/emmintrin.h
rename to sdk/include/vcruntime/emmintrin.h
diff --git a/sdk/include/crt/excpt.h b/sdk/include/vcruntime/excpt.h
similarity index 100%
rename from sdk/include/crt/excpt.h
rename to sdk/include/vcruntime/excpt.h
diff --git a/sdk/include/psdk/gcc_sal.h b/sdk/include/vcruntime/gcc_sal.h
similarity index 100%
rename from sdk/include/psdk/gcc_sal.h
rename to sdk/include/vcruntime/gcc_sal.h
diff --git a/sdk/include/crt/intrin.h b/sdk/include/vcruntime/intrin.h
similarity index 100%
rename from sdk/include/crt/intrin.h
rename to sdk/include/vcruntime/intrin.h
diff --git a/sdk/include/crt/limits.h b/sdk/include/vcruntime/limits.h
similarity index 100%
rename from sdk/include/crt/limits.h
rename to sdk/include/vcruntime/limits.h
diff --git a/sdk/include/crt/mingw32/gcc_float.h
b/sdk/include/vcruntime/mingw32/gcc_float.h
similarity index 100%
rename from sdk/include/crt/mingw32/gcc_float.h
rename to sdk/include/vcruntime/mingw32/gcc_float.h
diff --git a/sdk/include/crt/mingw32/intrin.h b/sdk/include/vcruntime/mingw32/intrin.h
similarity index 100%
rename from sdk/include/crt/mingw32/intrin.h
rename to sdk/include/vcruntime/mingw32/intrin.h
diff --git a/sdk/include/crt/mingw32/intrin_arm.h
b/sdk/include/vcruntime/mingw32/intrin_arm.h
similarity index 100%
rename from sdk/include/crt/mingw32/intrin_arm.h
rename to sdk/include/vcruntime/mingw32/intrin_arm.h
diff --git a/sdk/include/crt/mingw32/intrin_ppc.h
b/sdk/include/vcruntime/mingw32/intrin_ppc.h
similarity index 100%
rename from sdk/include/crt/mingw32/intrin_ppc.h
rename to sdk/include/vcruntime/mingw32/intrin_ppc.h
diff --git a/sdk/include/crt/mingw32/intrin_x86.h
b/sdk/include/vcruntime/mingw32/intrin_x86.h
similarity index 100%
rename from sdk/include/crt/mingw32/intrin_x86.h
rename to sdk/include/vcruntime/mingw32/intrin_x86.h
diff --git a/sdk/include/crt/mingw32/intrin_x86_64.h
b/sdk/include/vcruntime/mingw32/intrin_x86_64.h
similarity index 100%
rename from sdk/include/crt/mingw32/intrin_x86_64.h
rename to sdk/include/vcruntime/mingw32/intrin_x86_64.h
diff --git a/sdk/include/crt/mmintrin.h b/sdk/include/vcruntime/mmintrin.h
similarity index 100%
rename from sdk/include/crt/mmintrin.h
rename to sdk/include/vcruntime/mmintrin.h
diff --git a/sdk/include/psdk/ms_sal.h b/sdk/include/vcruntime/ms_sal.h
similarity index 100%
rename from sdk/include/psdk/ms_sal.h
rename to sdk/include/vcruntime/ms_sal.h
diff --git a/sdk/include/crt/msc/intrin.h b/sdk/include/vcruntime/msc/intrin.h
similarity index 100%
rename from sdk/include/crt/msc/intrin.h
rename to sdk/include/vcruntime/msc/intrin.h
diff --git a/sdk/include/crt/msc/msc_float.h b/sdk/include/vcruntime/msc/msc_float.h
similarity index 100%
rename from sdk/include/crt/msc/msc_float.h
rename to sdk/include/vcruntime/msc/msc_float.h
diff --git a/sdk/include/crt/pgobootrun.h b/sdk/include/vcruntime/pgobootrun.h
similarity index 100%
rename from sdk/include/crt/pgobootrun.h
rename to sdk/include/vcruntime/pgobootrun.h
diff --git a/sdk/include/crt/rtcapi.h b/sdk/include/vcruntime/rtcapi.h
similarity index 100%
rename from sdk/include/crt/rtcapi.h
rename to sdk/include/vcruntime/rtcapi.h
diff --git a/sdk/include/psdk/sal.h b/sdk/include/vcruntime/sal.h
similarity index 100%
rename from sdk/include/psdk/sal.h
rename to sdk/include/vcruntime/sal.h
diff --git a/sdk/include/crt/setjmp.h b/sdk/include/vcruntime/setjmp.h
similarity index 100%
rename from sdk/include/crt/setjmp.h
rename to sdk/include/vcruntime/setjmp.h
diff --git a/sdk/include/crt/setjmpex.h b/sdk/include/vcruntime/setjmpex.h
similarity index 100%
rename from sdk/include/crt/setjmpex.h
rename to sdk/include/vcruntime/setjmpex.h
diff --git a/sdk/include/crt/stdarg.h b/sdk/include/vcruntime/stdarg.h
similarity index 100%
rename from sdk/include/crt/stdarg.h
rename to sdk/include/vcruntime/stdarg.h
diff --git a/sdk/include/crt/stdbool.h b/sdk/include/vcruntime/stdbool.h
similarity index 100%
rename from sdk/include/crt/stdbool.h
rename to sdk/include/vcruntime/stdbool.h
diff --git a/sdk/include/crt/stdint.h b/sdk/include/vcruntime/stdint.h
similarity index 100%
rename from sdk/include/crt/stdint.h
rename to sdk/include/vcruntime/stdint.h
diff --git a/sdk/include/crt/vadefs.h b/sdk/include/vcruntime/vadefs.h
similarity index 100%
rename from sdk/include/crt/vadefs.h
rename to sdk/include/vcruntime/vadefs.h
diff --git a/sdk/include/crt/varargs.h b/sdk/include/vcruntime/varargs.h
similarity index 100%
rename from sdk/include/crt/varargs.h
rename to sdk/include/vcruntime/varargs.h
diff --git a/sdk/include/crt/xmmintrin.h b/sdk/include/vcruntime/xmmintrin.h
similarity index 100%
rename from sdk/include/crt/xmmintrin.h
rename to sdk/include/vcruntime/xmmintrin.h
diff --git a/sdk/include/crt/ymath.h b/sdk/include/vcruntime/ymath.h
similarity index 100%
rename from sdk/include/crt/ymath.h
rename to sdk/include/vcruntime/ymath.h
diff --git a/sdk/include/wdf/kmdf/1.17/wdf.h b/sdk/include/wdf/kmdf/1.17/wdf.h
index 2ea904466a5..733d0d3fcce 100644
--- a/sdk/include/wdf/kmdf/1.17/wdf.h
+++ b/sdk/include/wdf/kmdf/1.17/wdf.h
@@ -40,7 +40,7 @@ Revision History:
 #endif
 
 // reactos start
-#include <psdk/sal.h>
+#include <sal.h>
 #include <section_attribs.h>
 #define STDCALL __stdcall
 // reactos end