summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliuxianliang <[email protected]>2021-12-22 14:37:33 +0800
committerliuxianliang <[email protected]>2021-12-22 14:37:33 +0800
commit1ab47d2f31f0c191cdc89bf8c7aaa3f796d8be94 (patch)
tree3f91db41925e9537bc2138d52354249c89f8af3e
parent7759628db7c8737587f5c4f4a05c8114748d3be8 (diff)
[modify] #5333, PR; [lwip] solve the conflict between multi BYTE_ORDER(s)
-rw-r--r--components/net/lwip-1.4.1/src/arch/include/arch/cc.h8
-rw-r--r--components/net/lwip-1.4.1/src/arch/include/arch/sys_arch.h6
-rw-r--r--components/net/lwip-1.4.1/src/lwipopts.h4
-rw-r--r--components/net/lwip-2.0.2/src/arch/include/arch/cc.h8
-rw-r--r--components/net/lwip-2.0.2/src/arch/include/arch/sys_arch.h6
-rw-r--r--components/net/lwip-2.0.2/src/lwipopts.h4
-rw-r--r--components/net/lwip-2.0.3/src/arch/include/arch/cc.h7
-rw-r--r--components/net/lwip-2.0.3/src/arch/include/arch/sys_arch.h7
-rw-r--r--components/net/lwip-2.0.3/src/lwipopts.h4
-rw-r--r--components/net/lwip-2.1.2/src/arch/include/arch/cc.h8
-rw-r--r--components/net/lwip-2.1.2/src/arch/include/arch/sys_arch.h7
11 files changed, 35 insertions, 34 deletions
diff --git a/components/net/lwip-1.4.1/src/arch/include/arch/cc.h b/components/net/lwip-1.4.1/src/arch/include/arch/cc.h
index 82387b432d..50248b9863 100644
--- a/components/net/lwip-1.4.1/src/arch/include/arch/cc.h
+++ b/components/net/lwip-1.4.1/src/arch/include/arch/cc.h
@@ -40,6 +40,14 @@
#include <string.h>
#include <stdint.h>
+#ifndef BYTE_ORDER
+#ifdef RT_USING_BIG_ENDIAN
+#define BYTE_ORDER BIG_ENDIAN
+#else
+#define BYTE_ORDER LITTLE_ENDIAN
+#endif /* RT_USING_BIG_ENDIAN */
+#endif /* BYTE_ORDER */
+
typedef uint8_t u8_t;
typedef int8_t s8_t;
typedef uint16_t u16_t;
diff --git a/components/net/lwip-1.4.1/src/arch/include/arch/sys_arch.h b/components/net/lwip-1.4.1/src/arch/include/arch/sys_arch.h
index 72814aa25c..4c4eff942f 100644
--- a/components/net/lwip-1.4.1/src/arch/include/arch/sys_arch.h
+++ b/components/net/lwip-1.4.1/src/arch/include/arch/sys_arch.h
@@ -39,14 +39,10 @@
#include <rtthread.h>
-#ifndef BYTE_ORDER
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-
#define SYS_MBOX_NULL RT_NULL
#define SYS_SEM_NULL RT_NULL
-typedef u32_t sys_prot_t;
+typedef rt_uint32_t sys_prot_t;
#define SYS_MBOX_SIZE 10
#define SYS_LWIP_TIMER_NAME "timer"
diff --git a/components/net/lwip-1.4.1/src/lwipopts.h b/components/net/lwip-1.4.1/src/lwipopts.h
index a5e035b53a..312f4f83ec 100644
--- a/components/net/lwip-1.4.1/src/lwipopts.h
+++ b/components/net/lwip-1.4.1/src/lwipopts.h
@@ -37,10 +37,6 @@
#define LWIP_PLATFORM_BYTESWAP 0
-#ifndef BYTE_ORDER
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-
/* #define RT_LWIP_DEBUG */
#ifdef RT_LWIP_DEBUG
diff --git a/components/net/lwip-2.0.2/src/arch/include/arch/cc.h b/components/net/lwip-2.0.2/src/arch/include/arch/cc.h
index 28f86d257e..ea201be28a 100644
--- a/components/net/lwip-2.0.2/src/arch/include/arch/cc.h
+++ b/components/net/lwip-2.0.2/src/arch/include/arch/cc.h
@@ -39,6 +39,14 @@
#include <rtthread.h>
#include <string.h>
+#ifndef BYTE_ORDER
+#ifdef RT_USING_BIG_ENDIAN
+#define BYTE_ORDER BIG_ENDIAN
+#else
+#define BYTE_ORDER LITTLE_ENDIAN
+#endif /* RT_USING_BIG_ENDIAN */
+#endif /* BYTE_ORDER */
+
#define U16_F "hu"
#define S16_F "hd"
#define X16_F "hx"
diff --git a/components/net/lwip-2.0.2/src/arch/include/arch/sys_arch.h b/components/net/lwip-2.0.2/src/arch/include/arch/sys_arch.h
index 8637cc9263..478828d0a0 100644
--- a/components/net/lwip-2.0.2/src/arch/include/arch/sys_arch.h
+++ b/components/net/lwip-2.0.2/src/arch/include/arch/sys_arch.h
@@ -39,14 +39,10 @@
#include <rtthread.h>
-#ifndef BYTE_ORDER
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-
#define SYS_MBOX_NULL RT_NULL
#define SYS_SEM_NULL RT_NULL
-typedef u32_t sys_prot_t;
+typedef rt_uint32_t sys_prot_t;
#define SYS_MBOX_SIZE 10
#define SYS_LWIP_TIMER_NAME "timer"
diff --git a/components/net/lwip-2.0.2/src/lwipopts.h b/components/net/lwip-2.0.2/src/lwipopts.h
index fe6e2fef6f..9f5d03ebf7 100644
--- a/components/net/lwip-2.0.2/src/lwipopts.h
+++ b/components/net/lwip-2.0.2/src/lwipopts.h
@@ -45,10 +45,6 @@
#define LWIP_PLATFORM_BYTESWAP 0
-#ifndef BYTE_ORDER
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-
/* #define RT_LWIP_DEBUG */
#ifdef RT_LWIP_DEBUG
diff --git a/components/net/lwip-2.0.3/src/arch/include/arch/cc.h b/components/net/lwip-2.0.3/src/arch/include/arch/cc.h
index c7848adfc9..be5d406f50 100644
--- a/components/net/lwip-2.0.3/src/arch/include/arch/cc.h
+++ b/components/net/lwip-2.0.3/src/arch/include/arch/cc.h
@@ -39,6 +39,13 @@
#include <rtthread.h>
#include <string.h>
+#ifndef BYTE_ORDER
+#ifdef RT_USING_BIG_ENDIAN
+#define BYTE_ORDER BIG_ENDIAN
+#else
+#define BYTE_ORDER LITTLE_ENDIAN
+#endif /* RT_USING_BIG_ENDIAN */
+#endif /* BYTE_ORDER */
#define U16_F "hu"
#define S16_F "hd"
diff --git a/components/net/lwip-2.0.3/src/arch/include/arch/sys_arch.h b/components/net/lwip-2.0.3/src/arch/include/arch/sys_arch.h
index 8637cc9263..d065298bff 100644
--- a/components/net/lwip-2.0.3/src/arch/include/arch/sys_arch.h
+++ b/components/net/lwip-2.0.3/src/arch/include/arch/sys_arch.h
@@ -36,17 +36,12 @@
#define __ARCH_SYS_ARCH_H__
#include "arch/cc.h"
-
#include <rtthread.h>
-#ifndef BYTE_ORDER
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-
#define SYS_MBOX_NULL RT_NULL
#define SYS_SEM_NULL RT_NULL
-typedef u32_t sys_prot_t;
+typedef rt_uint32_t sys_prot_t;
#define SYS_MBOX_SIZE 10
#define SYS_LWIP_TIMER_NAME "timer"
diff --git a/components/net/lwip-2.0.3/src/lwipopts.h b/components/net/lwip-2.0.3/src/lwipopts.h
index fe6e2fef6f..9f5d03ebf7 100644
--- a/components/net/lwip-2.0.3/src/lwipopts.h
+++ b/components/net/lwip-2.0.3/src/lwipopts.h
@@ -45,10 +45,6 @@
#define LWIP_PLATFORM_BYTESWAP 0
-#ifndef BYTE_ORDER
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-
/* #define RT_LWIP_DEBUG */
#ifdef RT_LWIP_DEBUG
diff --git a/components/net/lwip-2.1.2/src/arch/include/arch/cc.h b/components/net/lwip-2.1.2/src/arch/include/arch/cc.h
index 28f86d257e..ea201be28a 100644
--- a/components/net/lwip-2.1.2/src/arch/include/arch/cc.h
+++ b/components/net/lwip-2.1.2/src/arch/include/arch/cc.h
@@ -39,6 +39,14 @@
#include <rtthread.h>
#include <string.h>
+#ifndef BYTE_ORDER
+#ifdef RT_USING_BIG_ENDIAN
+#define BYTE_ORDER BIG_ENDIAN
+#else
+#define BYTE_ORDER LITTLE_ENDIAN
+#endif /* RT_USING_BIG_ENDIAN */
+#endif /* BYTE_ORDER */
+
#define U16_F "hu"
#define S16_F "hd"
#define X16_F "hx"
diff --git a/components/net/lwip-2.1.2/src/arch/include/arch/sys_arch.h b/components/net/lwip-2.1.2/src/arch/include/arch/sys_arch.h
index 1e97f8a5ac..e487f58211 100644
--- a/components/net/lwip-2.1.2/src/arch/include/arch/sys_arch.h
+++ b/components/net/lwip-2.1.2/src/arch/include/arch/sys_arch.h
@@ -36,17 +36,12 @@
#define __ARCH_SYS_ARCH_H__
#include "arch/cc.h"
-
#include <rtthread.h>
-#ifndef BYTE_ORDER
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-
#define SYS_MBOX_NULL RT_NULL
#define SYS_SEM_NULL RT_NULL
-typedef u32_t sys_prot_t;
+typedef rt_uint32_t sys_prot_t;
#define SYS_MBOX_SIZE 10
#define SYS_LWIP_TIMER_NAME "timer"