diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@digia.com> | 2013-01-17 15:24:21 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-28 13:11:47 (GMT) |
| commit | c6ce46202a2c48adb8b17756568aa9f43d4eeb10 (patch) | |
| tree | 2019cef37034c546e0ab4956b1566649a834c87d /src/corelib | |
| parent | 6826602240fc2257166b0ea4f31667e792c4a3ae (diff) | |
| download | Qt-c6ce46202a2c48adb8b17756568aa9f43d4eeb10.zip Qt-c6ce46202a2c48adb8b17756568aa9f43d4eeb10.tar.gz Qt-c6ce46202a2c48adb8b17756568aa9f43d4eeb10.tar.bz2 | |
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
(cherry picked from qtbase/f7bd8652caab2f53ced739ce90c640924d4962dc)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/corelib')
| -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 117ca6d..0d3e838 100644 --- a/src/corelib/kernel/qfunctions_vxworks.h +++ b/src/corelib/kernel/qfunctions_vxworks.h @@ -61,6 +61,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 |