diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2012-04-16 19:53:52 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-17 18:05:33 (GMT) |
| commit | 61ce720a3ed7abcfb76d8353081e330bf1ba3a67 (patch) | |
| tree | 2b63d264f90317f2f0906e58a178455256c44389 | |
| parent | 9dd4dcf146d5f79f33842c340fbc5d3f253ac204 (diff) | |
| download | Qt-61ce720a3ed7abcfb76d8353081e330bf1ba3a67.zip Qt-61ce720a3ed7abcfb76d8353081e330bf1ba3a67.tar.gz Qt-61ce720a3ed7abcfb76d8353081e330bf1ba3a67.tar.bz2 | |
Do not redefine QT_SOCKLEN_T in freebsd-g++'s mkspec.
QT_SOCKLEN_T was being redefined depending on whether FreeBSD was < or
>= 4, branched in early 1999.
FreeBSD < 7 is not supported by the upstream project anymore, so we
can simplify the code and rely on the QT_SOCKLEN_T definition in
common/posix/qplatformdefs.h instead.
Cherry-picked from 1afad60e6030064fee772c37e2647ae8c891ac2f to
qt5/qtbase.
Change-Id: I9883755070d2731b12b1113def17ca217d510d6a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | mkspecs/freebsd-g++/qplatformdefs.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/mkspecs/freebsd-g++/qplatformdefs.h b/mkspecs/freebsd-g++/qplatformdefs.h index 6f6d9aa..27d0db4 100644 --- a/mkspecs/freebsd-g++/qplatformdefs.h +++ b/mkspecs/freebsd-g++/qplatformdefs.h @@ -79,18 +79,9 @@ #include "../common/posix/qplatformdefs.h" #undef QT_OPEN_LARGEFILE -#undef QT_SOCKLEN_T #define QT_OPEN_LARGEFILE 0 -#if !defined(__DragonFly__) && (__FreeBSD_version < 400000) -// FreeBSD 1.0 - 3.5.1 -#define QT_SOCKLEN_T int -#else -// FreeBSD 4.0 and better -#define QT_SOCKLEN_T socklen_t -#endif - #define QT_SNPRINTF ::snprintf #define QT_VSNPRINTF ::vsnprintf |