diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@digia.com> | 2013-01-17 17:24:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-23 10:38:59 +0100 |
| commit | f7bd8652caab2f53ced739ce90c640924d4962dc (patch) | |
| tree | 01e56dec9cfca728268e1560c36faba386a86c2a | |
| parent | 416e73a0fcaf31f7c32ba7dcd214b62e6060123c (diff) | |
Undefine overlapping variable names defined in VxWorks headers
VxWorks has defined variables with same name as in Qt's headers.
Undefine those variables to avoid naming conflict.
Change-Id: Ia8ca04a66acece683cd6c7f71df7e5a2800ec98d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| -rw-r--r-- | src/corelib/kernel/qfunctions_vxworks.h | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/src/corelib/kernel/qfunctions_vxworks.h b/src/corelib/kernel/qfunctions_vxworks.h index 67920d13cb..272f912a67 100644 --- a/src/corelib/kernel/qfunctions_vxworks.h +++ b/src/corelib/kernel/qfunctions_vxworks.h @@ -65,6 +65,44 @@ #include <net/if.h> #endif +// VxWorks has public header mbuf.h which defines following variables for DKM. +// Let's undef those to because they overlap with Qt variable names- +// File mbuf.h is included in headers <netinet/in.h> <net/if.h>, so make sure +// that those are included before undef's. +#if defined(mbuf) +# undef mbuf +#endif +#if defined(m_data) +# undef m_data +#endif +#if defined(m_type) +# undef m_type +#endif +#if defined(m_next) +# undef m_next +#endif +#if defined(m_len) +# undef m_len +#endif +#if defined(m_flags) +# undef m_flags +#endif +#if defined(m_hdr) +# undef m_hdr +#endif +#if defined(m_ext) +# undef m_ext +#endif +#if defined(m_act) +# undef m_act +#endif +#if defined(m_nextpkt) +# undef m_nextpkt +#endif +#if defined(m_pkthdr) +# undef m_pkthdr +#endif + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE |