mirror of
https://github.com/nasa/fprime.git
synced 2025-12-10 00:44:37 -06:00
Add undef to fix VxWorks collision problem (#4424)
* adding undef to fix collission problem. * Fix comment typo in UdpSocket.hpp
This commit is contained in:
parent
6a132c5df4
commit
6388f046e1
@ -20,6 +20,13 @@
|
||||
#ifdef TGT_OS_TYPE_VXWORKS
|
||||
#include <inetLib.h>
|
||||
#include <socket.h>
|
||||
|
||||
// Undefine these Vxworks-defined macros because
|
||||
// they collide with member variables in F Prime.
|
||||
// These macros are defined somewhere in inetLib.h.
|
||||
#undef m_type
|
||||
#undef m_data
|
||||
|
||||
#else
|
||||
#include <arpa/inet.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user