[Kde-cygwin-cvs] CVS: qt-3 qt-3-head.patch,NONE,1.1.2.1 configure,1.1.1.17,1.1.1.18 patched-original
Status: Inactive
Brought to you by:
habacker
Menu
▾
▴
[Kde-cygwin-cvs] CVS: qt-3 qt-3-head.patch,NONE,1.1.2.1 configure,1.1.1.17,1.1.1.18 patched-original-files.txt,1.1.2.11,1.1.2.12
|
From: Christian E. <che...@us...> - 2005-10-01 01:57:56
|
Update of /cvsroot/kde-cygwin/qt-3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6831 Modified Files: Tag: QT_WIN32_3_3_BRANCH configure patched-original-files.txt Added Files: Tag: QT_WIN32_3_3_BRANCH qt-3-head.patch Log Message: reapply patches which were lost during my not so good update to 3.3.5 --- NEW FILE: qt-3-head.patch --- Index: configure =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/configure,v retrieving revision 1.1.1.17 diff -u -r1.1.1.17 configure --- configure 22 Sep 2005 12:50:48 -0000 1.1.1.17 +++ configure 30 Sep 2005 16:45:24 -0000 @@ -49,6 +49,7 @@ PLATFORM_MAC=no PLATFORM_QWS=no PLATFORM_QNX=no +PLATFORM_WIN=no if [ -f $relpath/src/kernel/qapplication_mac.cpp ] && [ -d /System/Library/Frameworks/Carbon.framework ]; then # Qt/Mac @@ -67,9 +68,12 @@ else PLATFORM_QWS=maybe fi [...1525 lines suppressed...] QStringList::Iterator fit = familysubs.begin(); while (fit != familysubs.end()) { QStringList subs = QFont::substitutes(*fit); - settings.writeEntry("/qt/Font Substitutions/" + *fit, subs); + settings.writeEntry(key + "Font Substitutions/" + *fit, subs); fit++; } } Index: tools/qtconfig/qtconfig.pro =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/qtconfig/qtconfig.pro,v retrieving revision 1.1.1.9 diff -u -r1.1.1.9 qtconfig.pro --- tools/qtconfig/qtconfig.pro 22 Sep 2005 12:57:57 -0000 1.1.1.9 +++ tools/qtconfig/qtconfig.pro 30 Sep 2005 16:45:28 -0000 @@ -16,3 +16,4 @@ INCLUDEPATH += . DBFILE = qtconfig.db REQUIRES=full-config nocrosscompiler !win32* +win32:RC_FILE = qtconfig.rc Index: configure =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/configure,v retrieving revision 1.1.1.17 retrieving revision 1.1.1.18 diff -u -r1.1.1.17 -r1.1.1.18 --- configure 22 Sep 2005 12:50:48 -0000 1.1.1.17 +++ configure 30 Sep 2005 16:58:30 -0000 1.1.1.18 @@ -49,6 +49,7 @@ PLATFORM_MAC=no PLATFORM_QWS=no PLATFORM_QNX=no +PLATFORM_WIN=no if [ -f $relpath/src/kernel/qapplication_mac.cpp ] && [ -d /System/Library/Frameworks/Carbon.framework ]; then # Qt/Mac @@ -67,9 +68,12 @@ else PLATFORM_QWS=maybe fi +elif [ -f $relpath/src/kernel/qapplication_win.cpp ]; then + # Qt/Win + # ~ src/kernel/qapplication_win.cpp is present + PLATFORM_WIN=maybe fi - #------------------------------------------------------------------------------- # check commercial license #------------------------------------------------------------------------------- @@ -79,6 +83,7 @@ if [ -f $relpath/LICENSE.QPL -o -f $relpath/LICENSE.GPL ]; then [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes + [ "$PLATFORM_WIN" = "maybe" ] && PLATFORM_WIN=yes Edition="free" Licensee="Free" Products="qt-free" @@ -567,6 +572,9 @@ UNKNOWN_OPT=yes fi ;; + win32) + PLATFORM_WIN=yes + ;; profile) if [ "$VAL" = "yes" ]; then CFG_PROFILE=yes @@ -1160,6 +1168,9 @@ fi fi +# setup up top level Makefile +cp $relpath/Makefile.unix $relpath/Makefile + # if the source tree is different from the build tree, # symlink or copy part of the sources if [ "$OPT_SHADOW" = "yes" ]; then @@ -1446,7 +1457,11 @@ " ;; CYGWIN*:*) - PLATFORM=cygwin-g++ + if [ "$PLATFORM_WIN" = "yes" ] ; then + PLATFORM=cygwin-g++-win32 + else + PLATFORM=cygwin-g++ + fi ;; LynxOS*:*) PLATFORM=lynxos-g++ @@ -2336,6 +2351,14 @@ echo echo "Type 'Q' to view the Q Public License." affix="either" + elif [ "$PLATFORM_WIN" = "yes" ]; then + echo + echo "This is the Qt/Win Free Edition." + echo + echo "You are licensed to use this software under the terms of" + echo "the GNU General Public License (GPL)." + echo + affix="the" else echo echo "Internal error." @@ -2523,82 +2546,91 @@ fi # build qmake -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; - echo "Creating qmake. Please wait..." - rm -f mkspecs/default - ln -s `echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default - # fix makefiles - for mkfile in GNUmakefile Makefile; do - EXTRA_LFLAGS= - EXTRA_CFLAGS= - in_mkfile="${mkfile}.in" - if [ "$mkfile" = "Makefile" ]; then -# if which qmake >/dev/null 2>&1 && [ -f qmake/qmake.pro ]; then -# (cd qmake && qmake) >/dev/null 2>&1 && continue -# fi - in_mkfile="${mkfile}.unix" - fi - in_mkfile="$relpath/qmake/$in_mkfile" - mkfile="$outpath/qmake/$mkfile" - if [ -f "$mkfile" ]; then - [ "$Edition" = "troll" ] && $WHICH chflags >/dev/null 2>&1 && chflags nouchg $mkfile - rm -f $mkfile - fi - [ -f "$in_mkfile" ] || continue - - echo "########################################################################" >$mkfile - echo "## This file was autogenerated by configure, all changes will be lost ##" >>$mkfile - echo "########################################################################" >>$mkfile - grep "QMAKE_CC[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,QMAKE_CC,CC," >>$mkfile - grep "QMAKE_CXX[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,QMAKE_CXX,CXX," >>$mkfile - if [ "$CFG_DEBUG" = "yes" ]; then - grep "QMAKE_CFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile - EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)" - fi - if [ "$PLATFORM_MAC" = "yes" ]; then - echo "CARBON_LFLAGS +=-framework CoreServices" >>$mkfile - EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)" - EXTRA_CFLAGS="$EXTRA_CFLAGS \$(CARBON_CFLAGS) -DQT_MACOSX_VERSION=$QT_MAC_VERSION" - EXTRA_SOURCES="qurl.o qsettings_mac.o" - elif [ "$PLATFORM" = "tru64-cxx" ]; then - echo "OSF_LFLAGS = -lm" >>$mkfile - EXTRA_LFLAGS="$EXTRA_LFLAGS \$(OSF_LFLAGS)" - elif [ "$PLATFORM_QNX" = "yes" ]; then - echo "QNX_LFLAGS += -fhonor-std -fno-builtins -pipe" >>$mkfile - echo "QNX_CFLAGS += -lcpp" >>$mkfile - EXTRA_LFLAGS="$EXTRA_CFLAGS \$(QNX_LFLAGS)" - EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QNX_CFLAGS)" - fi - [ "$CFG_EMBEDDED" != "no" ] && EXTRA_CFLAGS="$EXTRA_CFLAGS -DQWS" - if [ '!' -z "$D_FLAGS" ]; then - for DEF in $D_FLAGS; do - EXTRA_CFLAGS="$EXTRA_CFLAGS -D${DEF}" - done - fi - if [ "$MIPSPRO_MINOR_VERSION" -gt "3" \ - -a "$IRIX_VERSION" -ge "18" -a "$IRIX_VERSION" -le "22" ]; then - EXTRA_CFLAGS="$EXTRA_CFLAGS -LANG:libc_in_namespace_std=off" - fi - QMAKE_BIN_DIR="$QT_INSTALL_BINS" - [ -z "$QMAKE_BIN_DIR" ] && QMAKE_BIN_DIR="${QT_INSTALL_PREFIX}/bin" - QMAKE_DATA_DIR="$QT_INSTALL_DATA" - [ -z "$QMAKE_DATA_DIR" ] && QMAKE_DATA_DIR="${QT_INSTALL_PREFIX}" - echo >>$mkfile - sed -e "s,@SOURCE_PATH@,$relpath,g" -e "s,@BUILD_PATH@,$outpath,g" \ - -e "s,@QMAKE_CFLAGS@,$EXTRA_CFLAGS,g" -e "s,@QMAKE_LFLAGS@,$EXTRA_LFLAGS,g" \ - -e "s,@QT_INSTALL_BINS@,\$(INSTALL_ROOT)$QMAKE_BIN_DIR,g" \ - -e "s,@QT_INSTALL_DATA@,\$(INSTALL_ROOT)$QMAKE_DATA_DIR,g" \ - -e "s,@QMAKE_QTOBJS@,$EXTRA_SOURCES,g" -e "s,@QMAKESPEC@,$QMAKESPEC,g" $in_mkfile >>$mkfile - - if [ "$Edition" = "troll" ] && - $WHICH makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then - (cd $outpath/qmake && $MAKE -f $mkfile depend) >/dev/null 2>&1 - fi - done - - (cd $outpath/qmake; $MAKE || (echo "qmake failed to build. Aborting." && exit 2)) || exit 2 -fi +case $UNAME_SYSTEM:$PLATFORM in + Linux:win32*) + # cross compile + echo "...updating qmake Makefile" + (cd $outpath/qmake && qmake -spec ${relpath}/mkspecs/$PLATFORM) # >/dev/null 2>&1 && continue + (cd $outpath/qmake; $MAKE || (echo "qmake failed to build. Aborting." && exit 2)) || exit 2 + ;; + *) + if true; then ###[ '!' -f "$outpath/bin/qmake" ]; + echo "Creating qmake. Please wait..." + rm -f mkspecs/default + ln -s `echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default + # fix makefiles + for mkfile in GNUmakefile Makefile; do + EXTRA_LFLAGS= + EXTRA_CFLAGS= + in_mkfile="${mkfile}.in" + if [ "$mkfile" = "Makefile" ]; then + # if which qmake >/dev/null 2>&1 && [ -f qmake/qmake.pro ]; then + # (cd qmake && qmake) >/dev/null 2>&1 && continue + # fi + in_mkfile="${mkfile}.unix" + fi + in_mkfile="$relpath/qmake/$in_mkfile" + mkfile="$outpath/qmake/$mkfile" + if [ -f "$mkfile" ]; then + [ "$Edition" = "troll" ] && $WHICH chflags >/dev/null 2>&1 && chflags nouchg $mkfile + rm -f $mkfile + fi + [ -f "$in_mkfile" ] || continue + + echo "########################################################################" >$mkfile + echo "## This file was autogenerated by configure, all changes will be lost ##" >>$mkfile + echo "########################################################################" >>$mkfile + grep "QMAKE_CC[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,QMAKE_CC,CC," >>$mkfile + grep "QMAKE_CXX[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,QMAKE_CXX,CXX," >>$mkfile + if [ "$CFG_DEBUG" = "yes" ]; then + grep "QMAKE_CFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile + EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)" + fi + if [ "$PLATFORM_MAC" = "yes" ]; then + echo "CARBON_LFLAGS +=-framework CoreServices" >>$mkfile + EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)" + EXTRA_CFLAGS="$EXTRA_CFLAGS \$(CARBON_CFLAGS) -DQT_MACOSX_VERSION=$QT_MAC_VERSION" + EXTRA_SOURCES="qurl.o qsettings_mac.o" + elif [ "$PLATFORM" = "tru64-cxx" ]; then + echo "OSF_LFLAGS = -lm" >>$mkfile + EXTRA_LFLAGS="$EXTRA_LFLAGS \$(OSF_LFLAGS)" + elif [ "$PLATFORM_QNX" = "yes" ]; then + echo "QNX_LFLAGS += -fhonor-std -fno-builtins -pipe" >>$mkfile + echo "QNX_CFLAGS += -lcpp" >>$mkfile + EXTRA_LFLAGS="$EXTRA_CFLAGS \$(QNX_LFLAGS)" + EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QNX_CFLAGS)" + fi + [ "$CFG_EMBEDDED" != "no" ] && EXTRA_CFLAGS="$EXTRA_CFLAGS -DQWS" + if [ '!' -z "$D_FLAGS" ]; then + for DEF in $D_FLAGS; do + EXTRA_CFLAGS="$EXTRA_CFLAGS -D${DEF}" + done + fi + if [ "$MIPSPRO_MINOR_VERSION" -gt "3" \ + -a "$IRIX_VERSION" -ge "18" -a "$IRIX_VERSION" -le "22" ]; then + EXTRA_CFLAGS="$EXTRA_CFLAGS -LANG:libc_in_namespace_std=off" + fi + QMAKE_BIN_DIR="$QT_INSTALL_BINS" + [ -z "$QMAKE_BIN_DIR" ] && QMAKE_BIN_DIR="${QT_INSTALL_PREFIX}/bin" + QMAKE_DATA_DIR="$QT_INSTALL_DATA" + [ -z "$QMAKE_DATA_DIR" ] && QMAKE_DATA_DIR="${QT_INSTALL_PREFIX}" + echo >>$mkfile + sed -e "s,@SOURCE_PATH@,$relpath,g" -e "s,@BUILD_PATH@,$outpath,g" \ + -e "s,@QMAKE_CFLAGS@,$EXTRA_CFLAGS,g" -e "s,@QMAKE_LFLAGS@,$EXTRA_LFLAGS,g" \ + -e "s,@QT_INSTALL_BINS@,\$(INSTALL_ROOT)$QMAKE_BIN_DIR,g" \ + -e "s,@QT_INSTALL_DATA@,\$(INSTALL_ROOT)$QMAKE_DATA_DIR,g" \ + -e "s,@QMAKE_QTOBJS@,$EXTRA_SOURCES,g" -e "s,@QMAKESPEC@,$QMAKESPEC,g" $in_mkfile >>$mkfile + + if [ "$Edition" = "troll" ] && + $WHICH makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then + (cd $outpath/qmake && $MAKE -f $mkfile depend) >/dev/null 2>&1 + fi + done + (cd $outpath/qmake; $MAKE || (echo "qmake failed to build. Aborting." && exit 2)) || exit 2 + fi + ;; +esac # clean up temporary qconfig.h and qmodules.h rm -f $outpath/include/qmake/qconfig.h rm -f $outpath/include/qmake/qmodules.h Index: patched-original-files.txt =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/Attic/patched-original-files.txt,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -u -r1.1.2.11 -r1.1.2.12 --- patched-original-files.txt 24 Apr 2005 12:34:18 -0000 1.1.2.11 +++ patched-original-files.txt 30 Sep 2005 16:58:30 -0000 1.1.2.12 @@ -10,6 +10,8 @@ 2. you must document and explain your changes in this file 3. and you should add the diff against the original file (mail from the kde-cygwin--cvs list). +Because some of the changes made aren't here, please see qt-3-head.patch for all changes. +I'll try to update this file asap. Version 3.3.3 changes @@ -60,8 +62,8 @@ RCS file: /cvsroot/kde-cygwin/qt-3/qmake/generators/win32/borland_bmake.cpp,v retrieving revision 1.1.1.10 diff -u -r1.1.1.10 borland_bmake.cpp ---- qmake/generators/win32/borland_bmake.cpp 29 Jan 2005 11:12:56 -0000 1.1.1.10 -+++ qmake/generators/win32/borland_bmake.cpp 30 Jan 2005 18:26:24 -0000 +--- qmake/generators/win32/borland_bmake.cpp 22 Sep 2005 12:57:34 -0000 1.1.1.14 ++++ qmake/generators/win32/borland_bmake.cpp 30 Sep 2005 16:45:24 -0000 @@ -105,7 +105,7 @@ t << "LINK = " << var("QMAKE_LINK") << endl; t << "LFLAGS = "; @@ -163,6 +165,7 @@ x11:SUBDIRS += biff \ _________________________________________________________________________________________________________________________ + * src/kernel/qprocess.cpp _________________________________________________________________________________________________________________________ @@ -389,18 +392,39 @@ RCS file: /cvsroot/kde-cygwin/qt-3/src/dialogs/qfiledialog.cpp,v retrieving revision 1.1.1.13 diff -u -3 -p -B -r1.1.1.13 qfiledialog.cpp ---- src/dialogs/qfiledialog.cpp 12 Feb 2005 00:17:10 -0000 1.1.1.13 -+++ src/dialogs/qfiledialog.cpp 15 Feb 2005 22:42:04 -0000 -@@ -5684,6 +5684,9 @@ static bool isRoot( const QUrl &u ) +--- src/dialogs/qfiledialog.cpp 22 Sep 2005 12:53:56 -0000 1.1.1.21 ++++ src/dialogs/qfiledialog.cpp 30 Sep 2005 16:45:24 -0000 +@@ -113,6 +113,20 @@ + #undef check + #endif - return FALSE; ++#if defined(Q_OS_CYGWIN) && defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) ++int getlogin_r (char* name, size_t namesize ) ++{ ++ char *s = getlogin(); ++ if (s) { ++ strncpy (name, s, namesize); ++ return 0; ++ } ++ else { ++ return -1; ++ } ++} ++#endif ++ + /* XPM */ + static const char * const start_xpm[]={ + "16 15 8 1", +@@ -5708,6 +5722,9 @@ + { + return d->url; } +#if defined(Q_CYGWIN_WIN) +Q_EXPORT int qt_ntfs_permission_lookup = 0; +#endif - #if defined(Q_WS_WIN) - extern int qt_ntfs_permission_lookup; + static bool isRoot( const QUrl &u ) + { Index: kernel/qapplication.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qapplication.cpp,v @@ -417,38 +441,19 @@ #include "qapplication_p.h" Qt::WindowsVersion QApplication::winVersion() -Index: kernel/qapplication_win.cpp -=================================================================== -RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/Attic/qapplication_win.cpp,v -retrieving revision 1.1.2.30.2.41 -diff -u -3 -p -B -r1.1.2.30.2.41 qapplication_win.cpp ---- src/kernel/qapplication_win.cpp 21 Jan 2005 11:14:51 -0000 1.1.2.30.2.41 -+++ src/kernel/qapplication_win.cpp 15 Feb 2005 22:42:33 -0000 -@@ -1494,9 +1494,10 @@ static void qt_init_internal( int *argcp - } - /* we can't call something like qt_init_dir() in qdir_win.cpp since link_includes and - configure.exe will fail linking because of missing qAddPostRoutine */ -+#if !defined(Q_CYGWIN_WIN) - extern void qt_dir_cleanup(); - qAddPostRoutine( qt_dir_cleanup ); -- -+#endif - // - // application style settings - // Index: kernel/qclipboard.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qclipboard.cpp,v retrieving revision 1.1.1.9 diff -u -3 -p -B -r1.1.1.9 qclipboard.cpp ---- src/kernel/qclipboard.cpp 29 Jan 2005 11:13:03 -0000 1.1.1.9 -+++ src/kernel/qclipboard.cpp 15 Feb 2005 22:42:33 -0000 -@@ -154,7 +154,7 @@ QClipboard::QClipboard( QObject *parent, +--- src/kernel/qclipboard.cpp 22 Sep 2005 12:55:16 -0000 1.1.1.13 ++++ src/kernel/qclipboard.cpp 30 Sep 2005 16:45:26 -0000 +@@ -154,7 +154,7 @@ // nothing } -#ifndef Q_WS_WIN32 -+#ifndef Q_WS_WIN ++#if !defined(Q_WS_WIN) /*! \internal @@ -477,27 +482,6 @@ // pending socket notifiers list QPtrList<QSockNot> sn_pending_list; #endif // Q_WS_WIN -Index: kernel/qprinter_win.cpp -=================================================================== -RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/Attic/qprinter_win.cpp,v -retrieving revision 1.1.2.6.2.17 -diff -u -3 -p -B -r1.1.2.6.2.17 qprinter_win.cpp ---- src/kernel/qprinter_win.cpp 20 Jan 2005 15:35:30 -0000 1.1.2.6.2.17 -+++ src/kernel/qprinter_win.cpp 15 Feb 2005 22:42:46 -0000 -@@ -639,8 +639,13 @@ bool QPrinter::cmd( int c, QPainter *pai - DOCINFO di; - di.cbSize = sizeof( DOCINFO ); - di.lpszDatatype = 0; -+#ifdef Q_CYGWIN_WIN -+ di.lpszDocName = doc_name.latin1(); -+ di.lpszOutput = output_filename.latin1(); -+#else - di.lpszDocName = ( WCHAR * ) doc_name.ucs2(); - di.lpszOutput = ( WCHAR * )output_filename.ucs2(); -+#endif - state = PST_ACTIVE; - if ( StartDoc( hdc, &di ) == SP_ERROR ) { - state = PST_ERROR; Index: kernel/qt_kernel.pri =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qt_kernel.pri,v @@ -540,38 +524,6 @@ unix:SOURCES += $$KERNEL_CPP/qprocess_unix.cpp \ $$KERNEL_CPP/qthread_unix.cpp -Index: kernel/qt_windows.h -=================================================================== -RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qt_windows.h,v -retrieving revision 1.2.2.10 -diff -u -3 -p -B -r1.2.2.10 qt_windows.h ---- src/kernel/qt_windows.h 17 Dec 2004 09:17:10 -0000 1.2.2.10 -+++ src/kernel/qt_windows.h 15 Feb 2005 22:42:56 -0000 -@@ -28,6 +28,24 @@ - - #include <windows.h> - -+#ifdef Q_CYGWIN_WIN -+#define WSAGETSELECTEVENT(l) LOWORD(l) -+#define FD_READ_BIT 0 -+#define FD_READ (1 << FD_READ_BIT) -+#define FD_WRITE_BIT 1 -+#define FD_WRITE (1 << FD_WRITE_BIT) -+#define FD_OOB_BIT 2 -+#define FD_OOB (1 << FD_OOB_BIT) -+#define FD_ACCEPT_BIT 3 -+#define FD_ACCEPT (1 << FD_ACCEPT_BIT) -+#define FD_CONNECT_BIT 4 -+#define FD_CONNECT (1 << FD_CONNECT_BIT) -+#define FD_CLOSE_BIT 5 -+#define FD_CLOSE (1 << FD_CLOSE_BIT) -+typedef unsigned int SOCKET; -+extern "C" int PASCAL WSAAsyncSelect(SOCKET,HWND,unsigned int,long); -+#endif -+ - #include "qnamespace.h" - - #ifndef QT_SOCKLEN_T Index: network/qt_network.pri =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/network/qt_network.pri,v |
