diff options
| author | WBI\nxf44444 <[email protected]> | 2020-10-26 15:02:42 +0800 |
|---|---|---|
| committer | WBI\nxf44444 <[email protected]> | 2020-10-26 15:02:42 +0800 |
| commit | b982de3971467f5c5cac5f8ce8f954bb9842ec0f (patch) | |
| tree | d0ca032ede444d43b2e54dcbea412149bc08f3a8 /components | |
| parent | 102976e89f2d5f004dbad25ad42a0dc659294ed2 (diff) | |
| parent | 9cd38972a27a9baf5278d62431c8f6e77b9878b1 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'components')
| -rw-r--r-- | components/net/lwip-1.4.1/src/arch/include/arch/cc.h | 6 | ||||
| -rw-r--r-- | components/net/lwip-2.0.2/src/arch/include/arch/cc.h | 4 | ||||
| -rw-r--r-- | components/net/lwip-2.1.2/src/arch/include/arch/cc.h | 4 |
3 files changed, 7 insertions, 7 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 80e9007459..251de66978 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 @@ -84,9 +84,9 @@ typedef uintptr_t mem_ptr_t; #define PACK_STRUCT_BEGIN #define PACK_STRUCT_END #elif defined(__IAR_SYSTEMS_ICC__) /* IAR Compiler */ -#define PACK_STRUCT_BEGIN #pragma pack(1) -#define PACK_STRUCT_STRUCT -#define PACK_STRUCT_END #pragma pack() +#define PACK_STRUCT_BEGIN +#define PACK_STRUCT_STRUCT +#define PACK_STRUCT_END #define PACK_STRUCT_FIELD(x) x #define PACK_STRUCT_USE_INCLUDES #elif defined(__GNUC__) /* GNU GCC Compiler */ 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 8888995bcc..ea6a5ff755 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 @@ -63,9 +63,9 @@ #define PACK_STRUCT_BEGIN #define PACK_STRUCT_END #elif defined(__IAR_SYSTEMS_ICC__) /* IAR Compiler */ -#define PACK_STRUCT_BEGIN #pragma pack(1) +#define PACK_STRUCT_BEGIN #define PACK_STRUCT_STRUCT -#define PACK_STRUCT_END #pragma pack() +#define PACK_STRUCT_END #define PACK_STRUCT_FIELD(x) x #define PACK_STRUCT_USE_INCLUDES #elif defined(__GNUC__) /* GNU GCC Compiler */ 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 61086b96d3..49c7541ed7 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 @@ -77,9 +77,9 @@ #define PACK_STRUCT_BEGIN #define PACK_STRUCT_END #elif defined(__IAR_SYSTEMS_ICC__) /* IAR Compiler */ -#define PACK_STRUCT_BEGIN #pragma pack(1) +#define PACK_STRUCT_BEGIN #define PACK_STRUCT_STRUCT -#define PACK_STRUCT_END #pragma pack() +#define PACK_STRUCT_END #define PACK_STRUCT_FIELD(x) x #define PACK_STRUCT_USE_INCLUDES #elif defined(__GNUC__) /* GNU GCC Compiler */ |