mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-11-16 14:11:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #50932: LWIP-provided byteorder functions defined in the wrong scope

Browse Source 
Apply suggested fix from "Fayek"
(cherry picked from commit fe8c62e7b6)
This commit is contained in:
Dirk Ziegelmeier 2017-05-03 22:28:46 +02:00 committed by goldsimon
parent f389d78f7e
commit c6b19cad34
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/include/lwip/def.h
View File

@ -91,14 +91,6 @@ u32_t lwip_htonl(u32_t x);
#endif #endif
#define lwip_ntohl(x) lwip_htonl(x) #define lwip_ntohl(x) lwip_htonl(x)
/* Provide usual function names as macros for users, but this can be turned off */
#ifndef LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS
#define htons(x) lwip_htons(x)
#define ntohs(x) lwip_ntohs(x)
#define htonl(x) lwip_htonl(x)
#define ntohl(x) lwip_ntohl(x)
#endif
/* These macros should be calculated by the preprocessor and are used /* These macros should be calculated by the preprocessor and are used
with compile-time constants only (so that there is no little-endian with compile-time constants only (so that there is no little-endian
overhead at runtime). */ overhead at runtime). */
@ -109,9 +101,16 @@ u32_t lwip_htonl(u32_t x);
(((x) & 0x00ff0000UL) >> 8) | \ (((x) & 0x00ff0000UL) >> 8) | \
(((x) & 0xff000000UL) >> 24)) (((x) & 0xff000000UL) >> 24))
#define PP_NTOHL(x) PP_HTONL(x) #define PP_NTOHL(x) PP_HTONL(x)
#endif /* BYTE_ORDER == BIG_ENDIAN */ #endif /* BYTE_ORDER == BIG_ENDIAN */
/* Provide usual function names as macros for users, but this can be turned off */
#ifndef LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS
#define htons(x) lwip_htons(x)
#define ntohs(x) lwip_ntohs(x)
#define htonl(x) lwip_htonl(x)
#define ntohl(x) lwip_ntohl(x)
#endif
/* Functions that are not available as standard implementations. /* Functions that are not available as standard implementations.
* In cc.h, you can #define these to implementations available on * In cc.h, you can #define these to implementations available on
* your platform to save some code bytes if you use these functions * your platform to save some code bytes if you use these functions