This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new d41e3da911 Fix ALIGN_UP duplicate definition error
d41e3da911 is described below
commit d41e3da9114cfd4c943c86e3da120b77306b1e7d
Author: wangmingrong1 <wangmingro...@xiaomi.com>
AuthorDate: Wed Nov 20 10:28:50 2024 +0800
Fix ALIGN_UP duplicate definition error
ALIGN_UP has been defined in nuttx.h
Signed-off-by: wangmingrong1 <wangmingro...@xiaomi.com>
---
arch/arm/src/mps/mps_allocateheap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/src/mps/mps_allocateheap.c
b/arch/arm/src/mps/mps_allocateheap.c
index a576c54c26..747ad2b047 100644
--- a/arch/arm/src/mps/mps_allocateheap.c
+++ b/arch/arm/src/mps/mps_allocateheap.c
@@ -23,6 +23,8 @@
****************************************************************************/
#include <nuttx/config.h>
+#include <nuttx/nuttx.h>
+
#include <sys/types.h>
#include <stdint.h>
#include <assert.h>
@@ -43,8 +45,6 @@
* Pre-processor Definitions
****************************************************************************/
-#define ALIGN_UP(x, a) (((x) + (a) - 1) & ~((a) - 1))
-
/* Configuration ************************************************************/
/* Terminology.
