diff options
| author |  Fabio Bas | 2008-05-28 16:38:25 +0000 |
|---|---|---|
| committer | Fabio Bas | 2008-05-28 16:38:25 +0000 |
| commit | 7aec951cbe0b6444e82a5b0dc46050d2adb28be1 (patch) | |
| tree | 567142fe3c2ae20b60558beb8ea9947ca585949b /src/modules/dcc | |
| parent | mingw32: added proper rules to permit modules compilation/linking (diff) | |
| download | KVIrc-7aec951cbe0b6444e82a5b0dc46050d2adb28be1.tar.gz KVIrc-7aec951cbe0b6444e82a5b0dc46050d2adb28be1.tar.bz2 KVIrc-7aec951cbe0b6444e82a5b0dc46050d2adb28be1.zip | |
mingw32: fixed module compilation up to kvirijndael; added some installation rules to test
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1864 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/dcc')
| -rw-r--r-- | src/modules/dcc/chat.cpp | 2 | ||||
| -rw-r--r-- | src/modules/dcc/send.cpp | 2 | ||||
| -rw-r--r-- | src/modules/dcc/voice.cpp | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index 6e16bed5b..0968db127 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -813,7 +813,7 @@ handle_system_error: if(sentLen < 0) { int err = kvi_socket_error(); -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) if((err != EAGAIN) || (err != EINTR) || (err != WSAEWOULDBLOCK)) #else if((err != EAGAIN)||(err != EINTR)) diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp index f487f139f..1e16df77c 100644 --- a/src/modules/dcc/send.cpp +++ b/src/modules/dcc/send.cpp @@ -1386,7 +1386,7 @@ KviDccFileTransfer * KviDccFileTransfer::nonFailedTransferWithLocalFileName(cons if(!g_pDccFileTransfers)return 0; for(KviDccFileTransfer * t = g_pDccFileTransfers->first();t;t = g_pDccFileTransfers->next()) { -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) // on windows the file names are case insensitive if(t->localFileName().toLower() == szLocalFileName.toLower()) #else diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index 7891d8e9f..a0a3c958d 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -44,8 +44,8 @@ #include <QSplitter> #include <QSlider> #include <QToolTip> - -#ifndef COMPILE_ON_WINDOWS +
+#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) #include <sys/time.h> #include <sys/types.h> #include <unistd.h> @@ -54,7 +54,7 @@ //#include "kvi_error.h" #include <sys/stat.h> // for open() #include <sys/ioctl.h> // for ioctl() -#endif //!COMPILE_ON_WIDNOWS +#endif extern KviDccBroker * g_pDccBroker; @@ -72,7 +72,7 @@ extern KviDccBroker * g_pDccBroker; #else //CAN NOT COMPILE :( #define COMPILE_DISABLE_DCC_VOICE - #ifndef COMPILE_ON_WINDOWS + #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) #warning "Cannot find the soundcard.h header; you will NOT be able to use DCC Voice" #endif #endif |