nasa/fprime
1
0
Fork 0
mirror of https://github.com/nasa/fprime.git synced 2025-12-10 00:44:37 -06:00
Code Issues Packages Projects Releases 34 Wiki Activity

Add undef to fix VxWorks collision problem (#4424)

Browse Source 
* adding undef to fix collission problem.

* Fix comment typo in UdpSocket.hpp
This commit is contained in:
kevin-f-ortega 2025-11-18 10:05:11 -08:00 committed by GitHub
parent 6a132c5df4
commit 6388f046e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Drv/Ip/UdpSocket.hpp
View File

@ -20,6 +20,13 @@
#ifdef TGT_OS_TYPE_VXWORKS #ifdef TGT_OS_TYPE_VXWORKS
#include <inetLib.h> #include <inetLib.h>
#include <socket.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 #else
#include <arpa/inet.h> #include <arpa/inet.h>
#include <sys/socket.h> #include <sys/socket.h>