mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-12-26 12:13:47 +00:00
do not export struct timeval to external users of socket.h to avoid conflicts
This commit is contained in:
parent
6c6f32f17f
commit
6d704c728e
@ -37,6 +37,7 @@
|
|||||||
#include "lwip/arch.h"
|
#include "lwip/arch.h"
|
||||||
#include "lwip/sys.h"
|
#include "lwip/sys.h"
|
||||||
|
|
||||||
|
#define LWIP_TIMEVAL_PRIVATE
|
||||||
#include "lwip/sockets.h"
|
#include "lwip/sockets.h"
|
||||||
|
|
||||||
#define NUM_SOCKETS MEMP_NUM_NETCONN
|
#define NUM_SOCKETS MEMP_NUM_NETCONN
|
||||||
|
@ -205,10 +205,16 @@ struct linger {
|
|||||||
unsigned char fd_bits [(FD_SETSIZE+7)/8];
|
unsigned char fd_bits [(FD_SETSIZE+7)/8];
|
||||||
} fd_set;
|
} fd_set;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* only define this in sockets.c so it does not interfere
|
||||||
|
* with other projects namespaces where timeval is present
|
||||||
|
*/
|
||||||
|
#ifdef LWIP_TIMEVAL_PRIVATE
|
||||||
struct timeval {
|
struct timeval {
|
||||||
long tv_sec; /* seconds */
|
long tv_sec; /* seconds */
|
||||||
long tv_usec; /* and microseconds */
|
long tv_usec; /* and microseconds */
|
||||||
};
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user