Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-09-21 02:06:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #5333 from mysterywolf/lwip

Browse Source 
[lwip] solve the conflict between multi BYTE_ORDER(s)
This commit is contained in:
Bernard Xiong
2021-12-05 22:09:11 +08:00
committed by GitHub
parent 36d5154256 d7032b9c01
commit 3dd1aa754c
12 changed files with 35 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/net/lwip-1.4.1/src/arch/include/arch/cc.h
+8
View File
@@ -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;
components/net/lwip-1.4.1/src/arch/include/arch/sys_arch.h
+1 -8
View File
@@ -36,19 +36,12 @@
#define __ARCH_SYS_ARCH_H__
#include "arch/cc.h"
#include <rtthread.h>
#ifdef RT_USING_BIG_ENDIAN
#define BYTE_ORDER BIG_ENDIAN
#else
#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"
components/net/lwip-1.4.1/src/lwipopts.h
-4
View File
@@ -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
components/net/lwip-2.0.2/src/arch/include/arch/cc.h
+8
View File
@@ -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"
components/net/lwip-2.0.2/src/arch/include/arch/sys_arch.h
+1 -8
View File
@@ -36,19 +36,12 @@
#define __ARCH_SYS_ARCH_H__
#include "arch/cc.h"
#include <rtthread.h>
#ifdef RT_USING_BIG_ENDIAN
#define BYTE_ORDER BIG_ENDIAN
#else
#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"
components/net/lwip-2.0.2/src/lwipopts.h
-4
View File
@@ -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
components/net/lwip-2.0.3/src/arch/include/arch/cc.h
+7
View File
@@ -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"
components/net/lwip-2.0.3/src/arch/include/arch/sys_arch.h
+1 -8
View File
@@ -36,19 +36,12 @@
#define __ARCH_SYS_ARCH_H__
#include "arch/cc.h"
#include <rtthread.h>
#ifdef RT_USING_BIG_ENDIAN
#define BYTE_ORDER BIG_ENDIAN
#else
#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"
components/net/lwip-2.0.3/src/lwipopts.h
-4
View File
@@ -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
components/net/lwip-2.1.2/src/arch/include/arch/cc.h
+8
View File
@@ -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"
components/net/lwip-2.1.2/src/arch/include/arch/sys_arch.h
+1 -8
View File
@@ -36,19 +36,12 @@
#define __ARCH_SYS_ARCH_H__
#include "arch/cc.h"
#include <rtthread.h>
#ifdef RT_USING_BIG_ENDIAN
#define BYTE_ORDER BIG_ENDIAN
#else
#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"
components/net/lwip-2.1.2/src/lwipopts.h
-4
View File
@@ -47,10 +47,6 @@
#define LWIP_PLATFORM_BYTESWAP 0
#ifndef BYTE_ORDER
#define BYTE_ORDER LITTLE_ENDIAN
#endif
/* #define RT_LWIP_DEBUG */
#ifdef RT_LWIP_DEBUG