do not export struct timeval to external users of socket.h to avoid conflicts

This commit is contained in:
jani 2004-03-26 13:21:35 +00:00
parent 6c6f32f17f
commit 6d704c728e
2 changed files with 7 additions and 0 deletions

View File

@ -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

View File

@ -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