author | zecke <zecke> | 2002-10-04 21:32:08 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-04 21:32:08 (UTC) |
commit | adc64501e1ce7789ce7915eebb6ebc0c318f5133 (patch) (unidiff) | |
tree | 30b769f7464facd4f5b6d7e270490992cc72b086 | |
parent | 10048c2dd7f7cd26c582d64b5e255b00b47de304 (diff) | |
download | opie-adc64501e1ce7789ce7915eebb6ebc0c318f5133.zip opie-adc64501e1ce7789ce7915eebb6ebc0c318f5133.tar.gz opie-adc64501e1ce7789ce7915eebb6ebc0c318f5133.tar.bz2 |
Next try
include <qglobal.h> to get _OS_LINUX from tt
-rw-r--r-- | core/launcher/transferserver.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp index f9204ab..d2f5501 100644 --- a/core/launcher/transferserver.cpp +++ b/core/launcher/transferserver.cpp | |||
@@ -1,75 +1,78 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of the Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #define _XOPEN_SOURCE | 20 | #define _XOPEN_SOURCE |
21 | #include <pwd.h> | 21 | #include <pwd.h> |
22 | #include <sys/types.h> | 22 | #include <sys/types.h> |
23 | #include <unistd.h> | 23 | #include <unistd.h> |
24 | #include <stdlib.h> | 24 | #include <stdlib.h> |
25 | #include <time.h> | 25 | #include <time.h> |
26 | #include <shadow.h> | 26 | #include <shadow.h> |
27 | 27 | ||
28 | /* we need the _OS_LINUX stuff first ! */ | ||
29 | #include <qglobal.h> | ||
30 | |||
28 | #ifndef _OS_LINUX_ | 31 | #ifndef _OS_LINUX_ |
29 | 32 | ||
30 | extern "C" { | 33 | extern "C" { |
31 | #include <uuid/uuid.h> | 34 | #include <uuid/uuid.h> |
32 | #define UUID_H_INCLUDED | 35 | #define UUID_H_INCLUDED |
33 | } | 36 | } |
34 | 37 | ||
35 | #endif // not defined linux | 38 | #endif // not defined linux |
36 | 39 | ||
37 | #if defined(_OS_LINUX_) | 40 | #if defined(_OS_LINUX_) |
38 | #include <shadow.h> | 41 | #include <shadow.h> |
39 | #endif | 42 | #endif |
40 | 43 | ||
41 | #include <qdir.h> | 44 | #include <qdir.h> |
42 | #include <qfile.h> | 45 | #include <qfile.h> |
43 | #include <qtextstream.h> | 46 | #include <qtextstream.h> |
44 | #include <qdatastream.h> | 47 | #include <qdatastream.h> |
45 | #include <qmessagebox.h> | 48 | #include <qmessagebox.h> |
46 | #include <qstringlist.h> | 49 | #include <qstringlist.h> |
47 | #include <qfileinfo.h> | 50 | #include <qfileinfo.h> |
48 | #include <qregexp.h> | 51 | #include <qregexp.h> |
49 | //#include <qpe/qcopchannel_qws.h> | 52 | //#include <qpe/qcopchannel_qws.h> |
50 | #include <qpe/process.h> | 53 | #include <qpe/process.h> |
51 | #include <qpe/global.h> | 54 | #include <qpe/global.h> |
52 | #include <qpe/config.h> | 55 | #include <qpe/config.h> |
53 | #include <qpe/contact.h> | 56 | #include <qpe/contact.h> |
54 | #include <qpe/quuid.h> | 57 | #include <qpe/quuid.h> |
55 | #include <qpe/version.h> | 58 | #include <qpe/version.h> |
56 | #ifdef QWS | 59 | #ifdef QWS |
57 | #include <qpe/qcopenvelope_qws.h> | 60 | #include <qpe/qcopenvelope_qws.h> |
58 | #endif | 61 | #endif |
59 | 62 | ||
60 | #include "transferserver.h" | 63 | #include "transferserver.h" |
61 | #include "qprocess.h" | 64 | #include "qprocess.h" |
62 | 65 | ||
63 | const int block_size = 51200; | 66 | const int block_size = 51200; |
64 | 67 | ||
65 | TransferServer::TransferServer( Q_UINT16 port, QObject *parent , | 68 | TransferServer::TransferServer( Q_UINT16 port, QObject *parent , |
66 | const char* name ) | 69 | const char* name ) |
67 | : QServerSocket( port, 1, parent, name ) | 70 | : QServerSocket( port, 1, parent, name ) |
68 | { | 71 | { |
69 | if ( !ok() ) | 72 | if ( !ok() ) |
70 | qWarning( "Failed to bind to port %d", port ); | 73 | qWarning( "Failed to bind to port %d", port ); |
71 | } | 74 | } |
72 | 75 | ||
73 | TransferServer::~TransferServer() | 76 | TransferServer::~TransferServer() |
74 | { | 77 | { |
75 | 78 | ||