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

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

Update of /cvsroot/qtwin/qt-4/mkspecs/linux-g++-64
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10262/mkspecs/linux-g++-64

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++-64/qmake.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qmake.conf	22 Sep 2005 12:18:50 -0000	1.2
+++ qmake.conf	14 Dec 2005 06:48:33 -0000	1.3
@@ -16,7 +16,10 @@
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= -pipe
+QMAKE_YACCFLAGS_MANGLE  = -p $base -b $base
+QMAKE_YACC_HEADER       = $base.tab.h
+QMAKE_YACC_SOURCE       = $base.tab.c
+QMAKE_CFLAGS		= -m64 -pipe
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
@@ -50,7 +53,7 @@
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -m64
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared

Index: qplatformdefs.h
===================================================================
RCS file: /cvsroot/qtwin/qt-4/mkspecs/linux-g++-64/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
@@ -20,6 +20,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 +38,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 +66,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