Skip to content

Commit d7032b9

Browse files
mysterywolfmysterywolf
committed
[lwip] solve the conflict between multi BYTE_ORDER(s)
1 parent 36d5154 commit d7032b9

File tree

12 files changed

+35
-48
lines changed

12 files changed

+35
-48
lines changed

‎components/net/lwip-1.4.1/src/arch/include/arch/cc.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,14 @@
4040
#include <string.h>
4141
#include <stdint.h>
4242

43+
#ifndef BYTE_ORDER
44+
#ifdef RT_USING_BIG_ENDIAN
45+
#define BYTE_ORDER BIG_ENDIAN
46+
#else
47+
#define BYTE_ORDER LITTLE_ENDIAN
48+
#endif /* RT_USING_BIG_ENDIAN */
49+
#endif /* BYTE_ORDER */
50+
4351
typedef uint8_t u8_t;
4452
typedef int8_t s8_t;
4553
typedef uint16_t u16_t;

‎components/net/lwip-1.4.1/src/arch/include/arch/sys_arch.h‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,12 @@
3636
#define __ARCH_SYS_ARCH_H__
3737

3838
#include "arch/cc.h"
39-
4039
#include <rtthread.h>
4140

42-
#ifdef RT_USING_BIG_ENDIAN
43-
#define BYTE_ORDER BIG_ENDIAN
44-
#else
45-
#define BYTE_ORDER LITTLE_ENDIAN
46-
#endif
47-
4841
#define SYS_MBOX_NULL RT_NULL
4942
#define SYS_SEM_NULL RT_NULL
5043

51-
typedef u32_t sys_prot_t;
44+
typedef rt_uint32_t sys_prot_t;
5245

5346
#define SYS_MBOX_SIZE 10
5447
#define SYS_LWIP_TIMER_NAME "timer"

‎components/net/lwip-1.4.1/src/lwipopts.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@
3737

3838
#define LWIP_PLATFORM_BYTESWAP 0
3939

40-
#ifndef BYTE_ORDER
41-
#define BYTE_ORDER LITTLE_ENDIAN
42-
#endif
43-
4440
/* #define RT_LWIP_DEBUG */
4541

4642
#ifdef RT_LWIP_DEBUG

‎components/net/lwip-2.0.2/src/arch/include/arch/cc.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@
3939
#include <rtthread.h>
4040
#include <string.h>
4141

42+
#ifndef BYTE_ORDER
43+
#ifdef RT_USING_BIG_ENDIAN
44+
#define BYTE_ORDER BIG_ENDIAN
45+
#else
46+
#define BYTE_ORDER LITTLE_ENDIAN
47+
#endif /* RT_USING_BIG_ENDIAN */
48+
#endif /* BYTE_ORDER */
49+
4250
#define U16_F "hu"
4351
#define S16_F "hd"
4452
#define X16_F "hx"

‎components/net/lwip-2.0.2/src/arch/include/arch/sys_arch.h‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,12 @@
3636
#define __ARCH_SYS_ARCH_H__
3737

3838
#include "arch/cc.h"
39-
4039
#include <rtthread.h>
4140

42-
#ifdef RT_USING_BIG_ENDIAN
43-
#define BYTE_ORDER BIG_ENDIAN
44-
#else
45-
#define BYTE_ORDER LITTLE_ENDIAN
46-
#endif
47-
4841
#define SYS_MBOX_NULL RT_NULL
4942
#define SYS_SEM_NULL RT_NULL
5043

51-
typedef u32_t sys_prot_t;
44+
typedef rt_uint32_t sys_prot_t;
5245

5346
#define SYS_MBOX_SIZE 10
5447
#define SYS_LWIP_TIMER_NAME "timer"

‎components/net/lwip-2.0.2/src/lwipopts.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@
4545

4646
#define LWIP_PLATFORM_BYTESWAP 0
4747

48-
#ifndef BYTE_ORDER
49-
#define BYTE_ORDER LITTLE_ENDIAN
50-
#endif
51-
5248
/* #define RT_LWIP_DEBUG */
5349

5450
#ifdef RT_LWIP_DEBUG

‎components/net/lwip-2.0.3/src/arch/include/arch/cc.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@
3939
#include <rtthread.h>
4040
#include <string.h>
4141

42+
#ifndef BYTE_ORDER
43+
#ifdef RT_USING_BIG_ENDIAN
44+
#define BYTE_ORDER BIG_ENDIAN
45+
#else
46+
#define BYTE_ORDER LITTLE_ENDIAN
47+
#endif /* RT_USING_BIG_ENDIAN */
48+
#endif /* BYTE_ORDER */
4249

4350
#define U16_F "hu"
4451
#define S16_F "hd"

‎components/net/lwip-2.0.3/src/arch/include/arch/sys_arch.h‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,12 @@
3636
#define __ARCH_SYS_ARCH_H__
3737

3838
#include "arch/cc.h"
39-
4039
#include <rtthread.h>
4140

42-
#ifdef RT_USING_BIG_ENDIAN
43-
#define BYTE_ORDER BIG_ENDIAN
44-
#else
45-
#define BYTE_ORDER LITTLE_ENDIAN
46-
#endif
47-
4841
#define SYS_MBOX_NULL RT_NULL
4942
#define SYS_SEM_NULL RT_NULL
5043

51-
typedef u32_t sys_prot_t;
44+
typedef rt_uint32_t sys_prot_t;
5245

5346
#define SYS_MBOX_SIZE 10
5447
#define SYS_LWIP_TIMER_NAME "timer"

‎components/net/lwip-2.0.3/src/lwipopts.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@
4545

4646
#define LWIP_PLATFORM_BYTESWAP 0
4747

48-
#ifndef BYTE_ORDER
49-
#define BYTE_ORDER LITTLE_ENDIAN
50-
#endif
51-
5248
/* #define RT_LWIP_DEBUG */
5349

5450
#ifdef RT_LWIP_DEBUG

‎components/net/lwip-2.1.2/src/arch/include/arch/cc.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@
3939
#include <rtthread.h>
4040
#include <string.h>
4141

42+
#ifndef BYTE_ORDER
43+
#ifdef RT_USING_BIG_ENDIAN
44+
#define BYTE_ORDER BIG_ENDIAN
45+
#else
46+
#define BYTE_ORDER LITTLE_ENDIAN
47+
#endif /* RT_USING_BIG_ENDIAN */
48+
#endif /* BYTE_ORDER */
49+
4250
#define U16_F "hu"
4351
#define S16_F "hd"
4452
#define X16_F "hx"

0 commit comments

Comments
 (0)