|
From: Christian E. <che...@us...> - 2005-12-14 06:51:27
|
Update of /cvsroot/qtwin/qt-4/mkspecs/qws/linux-x86-g++ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10262/mkspecs/qws/linux-x86-g++ Modified Files: qmake.conf qplatformdefs.h Log Message: 4.0.1->4.1.0rc1 Index: qmake.conf =================================================================== RCS file: /cvsroot/qtwin/qt-4/mkspecs/qws/linux-x86-g++/qmake.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qmake.conf 2 Jul 2005 19:38:05 -0000 1.1 +++ qmake.conf 14 Dec 2005 06:48:34 -0000 1.2 @@ -21,9 +21,10 @@ QMAKE_CFLAGS_SHLIB = -fPIC QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CFLAGS_THREAD = -D_REENTRANT +QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -fno-exceptions QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE @@ -31,6 +32,7 @@ QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD +QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden QMAKE_INCDIR = QMAKE_LIBDIR = Index: qplatformdefs.h =================================================================== RCS file: /cvsroot/qtwin/qt-4/mkspecs/qws/linux-x86-g++/qplatformdefs.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qplatformdefs.h 22 Sep 2005 12:18:51 -0000 1.2 +++ qplatformdefs.h 14 Dec 2005 06:48:34 -0000 1.3 @@ -19,7 +19,7 @@ // We are hot - unistd.h should have turned on the specific APIs we requested - +#include <features.h> #include <pthread.h> #include <dirent.h> #include <fcntl.h> @@ -37,6 +37,9 @@ #include <sys/stat.h> #include <sys/wait.h> #include <netinet/in.h> +#ifndef QT_NO_IPV6IFNAME +#include <net/if.h> +#endif #ifdef QT_LARGEFILE_SUPPORT #define QT_STATBUF struct stat64 @@ -62,12 +65,12 @@ #ifdef QT_LARGEFILE_SUPPORT #define QT_FOPEN ::fopen64 -#define QT_FSEEK ::fseeko -#define QT_FTELL ::ftello +#define QT_FSEEK ::fseeko64 +#define QT_FTELL ::ftello64 #define QT_FGETPOS ::fgetpos64 #define QT_FSETPOS ::fsetpos64 #define QT_FPOS_T fpos64_t -#define QT_OFF_T off_t +#define QT_OFF_T off64_t #else #define QT_FOPEN ::fopen #define QT_FSEEK ::fseek |