Skip to content

Commit 9cd3897

Browse files
authored
Merge pull request #3981 from mysterywolf/pr1
[revert] [lwip] cc.h IAR structure
2 parents f48c1d8 + 22f8b14 commit 9cd3897

File tree

3 files changed

+7
-7
lines changed
  • components/net
    • lwip-1.4.1/src/arch/include/arch
    • lwip-2.0.2/src/arch/include/arch
    • lwip-2.1.2/src/arch/include/arch

3 files changed

+7
-7
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ typedef uintptr_t mem_ptr_t;
8484
#define PACK_STRUCT_BEGIN
8585
#define PACK_STRUCT_END
8686
#elif defined(__IAR_SYSTEMS_ICC__) /* IAR Compiler */
87-
#define PACK_STRUCT_BEGIN #pragma pack(1)
88-
#define PACK_STRUCT_STRUCT
89-
#define PACK_STRUCT_END #pragma pack()
87+
#define PACK_STRUCT_BEGIN
88+
#define PACK_STRUCT_STRUCT
89+
#define PACK_STRUCT_END
9090
#define PACK_STRUCT_FIELD(x) x
9191
#define PACK_STRUCT_USE_INCLUDES
9292
#elif defined(__GNUC__) /* GNU GCC Compiler */

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
#define PACK_STRUCT_BEGIN
6464
#define PACK_STRUCT_END
6565
#elif defined(__IAR_SYSTEMS_ICC__) /* IAR Compiler */
66-
#define PACK_STRUCT_BEGIN #pragma pack(1)
66+
#define PACK_STRUCT_BEGIN
6767
#define PACK_STRUCT_STRUCT
68-
#define PACK_STRUCT_END #pragma pack()
68+
#define PACK_STRUCT_END
6969
#define PACK_STRUCT_FIELD(x) x
7070
#define PACK_STRUCT_USE_INCLUDES
7171
#elif defined(__GNUC__) /* GNU GCC Compiler */

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
#define PACK_STRUCT_BEGIN
7878
#define PACK_STRUCT_END
7979
#elif defined(__IAR_SYSTEMS_ICC__) /* IAR Compiler */
80-
#define PACK_STRUCT_BEGIN #pragma pack(1)
80+
#define PACK_STRUCT_BEGIN
8181
#define PACK_STRUCT_STRUCT
82-
#define PACK_STRUCT_END #pragma pack()
82+
#define PACK_STRUCT_END
8383
#define PACK_STRUCT_FIELD(x) x
8484
#define PACK_STRUCT_USE_INCLUDES
8585
#elif defined(__GNUC__) /* GNU GCC Compiler */

0 commit comments

Comments
 (0)