https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90e95d15a2851f577e98d5d42522587f16b25f09
commit 90e95d15a2851f577e98d5d42522587f16b25f09
Author: Timo Kreuzer <timo.kreu...@reactos.org>
AuthorDate: Sat May 11 10:20:48 2024 +0300
Commit: Timo Kreuzer <timo.kreu...@reactos.org>
CommitDate: Sat Nov 2 12:52:59 2024 +0200
[VCRUNTIME] Move some definitions from crtdefs.h to vadefs.h
---
sdk/include/vcruntime/crtdefs.h | 33 ---------------------------------
sdk/include/vcruntime/vadefs.h | 33 +++++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/sdk/include/vcruntime/crtdefs.h b/sdk/include/vcruntime/crtdefs.h
index da025e5d0b6..5068c265b34 100644
--- a/sdk/include/vcruntime/crtdefs.h
+++ b/sdk/include/vcruntime/crtdefs.h
@@ -211,45 +211,12 @@
extern "C" {
#endif
-#ifndef _UINTPTR_T_DEFINED
-#define _UINTPTR_T_DEFINED
-#ifndef __uintptr_t_defined
-#define __uintptr_t_defined
-#undef uintptr_t
-#ifdef _WIN64
-#if defined(__GNUC__) && defined(__STRICT_ANSI__)
- typedef unsigned int uintptr_t __attribute__ ((mode (DI)));
-#else
- __MINGW_EXTENSION typedef unsigned __int64 uintptr_t;
-#endif
-#else
- typedef unsigned int uintptr_t;
-#endif
-#endif
-#endif
-
#ifndef _WCTYPE_T_DEFINED
#define _WCTYPE_T_DEFINED
typedef unsigned short wint_t;
typedef unsigned short wctype_t;
#endif
-#ifdef __GNUC__
-#ifndef __GNUC_VA_LIST
-#define __GNUC_VA_LIST
- typedef __builtin_va_list __gnuc_va_list;
-#endif
-#endif
-
-#ifndef _VA_LIST_DEFINED
-#define _VA_LIST_DEFINED
-#if defined(__GNUC__)
- typedef __gnuc_va_list va_list;
-#elif defined(_MSC_VER)
- typedef _Writable_bytes_(_Inexpressible_("length varies")) char * va_list;
-#endif
-#endif
-
#ifndef _ERRCODE_DEFINED
#define _ERRCODE_DEFINED
typedef int errcode;
diff --git a/sdk/include/vcruntime/vadefs.h b/sdk/include/vcruntime/vadefs.h
index f01e67e496b..57761f6858a 100644
--- a/sdk/include/vcruntime/vadefs.h
+++ b/sdk/include/vcruntime/vadefs.h
@@ -18,6 +18,39 @@
extern "C" {
#endif
+#ifdef __GNUC__
+#ifndef __GNUC_VA_LIST
+#define __GNUC_VA_LIST
+ typedef __builtin_va_list __gnuc_va_list;
+#endif
+#endif
+
+#ifndef _VA_LIST_DEFINED
+#define _VA_LIST_DEFINED
+#if defined(__GNUC__)
+ typedef __gnuc_va_list va_list;
+#elif defined(_MSC_VER)
+ typedef _Writable_bytes_(_Inexpressible_("length varies")) char * va_list;
+#endif
+#endif
+
+#ifndef _UINTPTR_T_DEFINED
+#define _UINTPTR_T_DEFINED
+#ifndef __uintptr_t_defined
+#define __uintptr_t_defined
+#undef uintptr_t
+#ifdef _WIN64
+#if defined(__GNUC__) && defined(__STRICT_ANSI__)
+ typedef unsigned int uintptr_t __attribute__ ((mode (DI)));
+#else
+ typedef unsigned __int64 uintptr_t;
+#endif
+#else
+ typedef unsigned int uintptr_t;
+#endif
+#endif
+#endif
+
#ifdef __cplusplus
#define _ADDRESSOF(v) (&reinterpret_cast<const char &>(v))
#else
