[Qtwin-cvs] CVS: qt-4/mkspecs/linux-g++ qmake.conf,1.1,1.2 qplatformdefs.h,1.2,1.3

[Christian E. <che...@us...>]

Update of /cvsroot/qtwin/qt-4/mkspecs/linux-g++
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10262/mkspecs/linux-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/linux-g++/qmake.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qmake.conf	2 Jul 2005 20:14:28 -0000	1.1
+++ qmake.conf	14 Dec 2005 06:48:33 -0000	1.2
@@ -10,7 +10,7 @@
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex
-QMAKE_LEXFLAGS		= 
+QMAKE_LEXFLAGS		=
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
 QMAKE_YACCFLAGS_MANGLE  = -p $base -b $base

Index: qplatformdefs.h
===================================================================
RCS file: /cvsroot/qtwin/qt-4/mkspecs/linux-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:50 -0000	1.2
+++ qplatformdefs.h	14 Dec 2005 06:48:33 -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