You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/11/06 06:14:46 UTC
[incubator-nuttx] branch master updated: arch/arm: Fix types.h:61:9: error: unknown type name '__UINT32_TYPE__'
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new fbd886deb5 arch/arm: Fix types.h:61:9: error: unknown type name '__UINT32_TYPE__'
fbd886deb5 is described below
commit fbd886deb5d226bdcad8d679d47d3f2e57c84685
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Nov 5 04:21:46 2022 +0800
arch/arm: Fix types.h:61:9: error: unknown type name '__UINT32_TYPE__'
regressed by: https://github.com/apache/incubator-nuttx/pull/7476
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/include/types.h | 50 ++++++++++++++++++++++++++----------------------
1 file changed, 27 insertions(+), 23 deletions(-)
diff --git a/arch/arm/include/types.h b/arch/arm/include/types.h
index 400e6077c4..eaaac738dd 100644
--- a/arch/arm/include/types.h
+++ b/arch/arm/include/types.h
@@ -50,31 +50,35 @@
* files
*/
-typedef signed char _int8_t;
-typedef unsigned char _uint8_t;
+typedef signed char _int8_t;
+typedef unsigned char _uint8_t;
-typedef signed short _int16_t;
-typedef unsigned short _uint16_t;
+typedef signed short _int16_t;
+typedef unsigned short _uint16_t;
#ifdef __INT32_TYPE__
-typedef __INT32_TYPE__ _int32_t;
-typedef __UINT32_TYPE__ _uint32_t;
+typedef __INT32_TYPE__ _int32_t;
+# ifdef __UINT32_TYPE__
+typedef __UINT32_TYPE__ _uint32_t;
+# else
+typedef unsigned __INT32_TYPE__ _uint32_t;
+# endif
#else
-typedef signed long _int32_t;
-typedef unsigned long _uint32_t;
+typedef signed long _int32_t;
+typedef unsigned long _uint32_t;
#endif
-typedef signed long long _int64_t;
-typedef unsigned long long _uint64_t;
+typedef signed long long _int64_t;
+typedef unsigned long long _uint64_t;
#define __INT64_DEFINED
-typedef _int64_t _intmax_t;
-typedef _uint64_t _uintmax_t;
+typedef _int64_t _intmax_t;
+typedef _uint64_t _uintmax_t;
#if defined(__WCHAR_TYPE__)
-typedef __WCHAR_TYPE__ _wchar_t;
+typedef __WCHAR_TYPE__ _wchar_t;
#else
-typedef int _wchar_t;
+typedef int _wchar_t;
#endif
/* A size is 4 bytes */
@@ -86,15 +90,15 @@ typedef int _wchar_t;
*/
#define unsigned signed
-typedef __SIZE_TYPE__ _ssize_t;
+typedef __SIZE_TYPE__ _ssize_t;
#undef unsigned
-typedef __SIZE_TYPE__ _size_t;
+typedef __SIZE_TYPE__ _size_t;
#elif defined(CONFIG_ARCH_SIZET_LONG)
-typedef signed long _ssize_t;
-typedef unsigned long _size_t;
+typedef signed long _ssize_t;
+typedef unsigned long _size_t;
#else
-typedef signed int _ssize_t;
-typedef unsigned int _size_t;
+typedef signed int _ssize_t;
+typedef unsigned int _size_t;
#endif
/* This is the size of the interrupt state save returned by up_irq_save().
@@ -104,12 +108,12 @@ typedef unsigned int _size_t;
#ifdef __thumb2__
#if defined(CONFIG_ARMV7M_USEBASEPRI) || defined(CONFIG_ARCH_ARMV6M) || defined(CONFIG_ARMV8M_USEBASEPRI)
-typedef unsigned char irqstate_t;
+typedef unsigned char irqstate_t;
#else
-typedef unsigned short irqstate_t;
+typedef unsigned short irqstate_t;
#endif
#else /* __thumb2__ */
-typedef unsigned int irqstate_t;
+typedef unsigned int irqstate_t;
#endif /* __thumb2__ */
#endif /* __ASSEMBLY__ */