some cleaning in cmake scripts/code:

- fix for #633 (added and documented obscure #defines)
- use #defines in kvi_sysconfig.h instead of -D compilation directives
- removed unused kvi_wincfg.h

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3653 17fca916-40b9-46aa-a4ea-0a15b648b75c

8 files changed, 78 insertions, 253 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index abd57d267..bfbddb156 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -312,6 +312,12 @@ ENDIF()
 #
 ###############################################################################
 
+# ingore sigalarm (useful with solaris threads)
+OPTION(WANT_IGNORE_SIGALARM "Ignore SIGALARM signal" OFF)
+IF(WITH_IGNORE_SIGALARM)
+	SET(WANT_IGNORE_SIGALARM ON)
+ENDIF()
+
 # Check for threads
 FIND_PACKAGE(Threads REQUIRED)
 IF(CMAKE_USE_WIN32_THREADS_INIT OR CMAKE_USE_PTHREADS_INIT)
@@ -325,12 +331,17 @@ IF(CMAKE_USE_WIN32_THREADS_INIT OR CMAKE_USE_PTHREADS_INIT)
 			LIST(APPEND LIBS ${CMAKE_THREAD_LIBS_INIT})
 		ENDIF()
 		SET(COMPILE_THREADS_USE_POSIX 1)
-		SET(CMAKE_STATUS_THREADS_SUPPORT "POSIX")
 		LIST(APPEND CMAKE_KVIRC_BUILD_FLAGS Threads=POSIX)
 		# FIXME: Solaris threads ?
 		#SET(COMPILE_THREADS_USE_SOLARIS_LIBTHREAD 1)
 		#SET(CMAKE_STATUS_THREADS_SUPPORT "SOLARIS")
 		#LIST(APPEND CMAKE_KVIRC_BUILD_FLAGS Threads=SOLARIS)
+		IF(WANT_IGNORE_SIGALARM)
+			SET(CMAKE_STATUS_THREADS_SUPPORT "POSIX (ignoring SIGALARM)")
+			SET(COMPILE_IGNORE_SIGALARM 1)
+		ELSE()
+			SET(CMAKE_STATUS_THREADS_SUPPORT "POSIX")
+		ENDIF()
 	ENDIF()
 ELSE()
 	SET(CMAKE_STATUS_THREADS_SUPPORT "Not used")
@@ -341,7 +352,7 @@ FIND_PACKAGE(ZLIB REQUIRED)
 IF(ZLIB_FOUND)
 	INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
 	LIST(APPEND LIBS ${ZLIB_LIBRARIES})
-	ADD_DEFINITIONS(-DCOMPILE_ZLIB_SUPPORT)
+	SET(COMPILE_ZLIB_SUPPORT 1)
 ENDIF()
 
 ############################################################################
@@ -365,7 +376,6 @@ IF(QT4_FOUND)
 			SET(QT_USE_QTDBUS true)
 			SET(CMAKE_STATUS_QTDBUS_SUPPORT "Yes")
 			SET(COMPILE_DBUS_SUPPORT 1)
-			ADD_DEFINITIONS(-DCOMPILE_DBUS_SUPPORT)
 			LIST(APPEND CMAKE_KVIRC_BUILD_FLAGS COMPILE_DBUS_SUPPORT)
 		ELSE()
 			SET(CMAKE_STATUS_QTDBUS_SUPPORT "Not available")
@@ -384,7 +394,6 @@ IF(QT4_FOUND)
 			SET(QT_USE_QTWEBKIT true)
 			SET(CMAKE_STATUS_QTWEBKIT_SUPPORT "Yes")
 			SET(COMPILE_WEBKIT_SUPPORT 1)
-			ADD_DEFINITIONS(-DCOMPILE_WEBKIT_SUPPORT)
 			LIST(APPEND CMAKE_KVIRC_BUILD_FLAGS COMPILE_WEBKIT_SUPPORT)
 		ELSE()
 			SET(CMAKE_STATUS_QTWEBKIT_SUPPORT "Not available")
@@ -407,15 +416,16 @@ IF(UNIX)
 		FIND_PACKAGE(X11)
 		IF(X11_FOUND)
 			SET(COMPILE_X11_SUPPORT 1)
+			SET(COMPILE_XSS_SUPPORT 1)
 			SET(CMAKE_STATUS_X11_SUPPORT "Yes")
 			INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
 			LIST(APPEND LIBS ${X11_LIBRARIES})
-            # Seems like ${X11_LIBRARIES} doesn't add -lXrender, which is needed
-            # for building with --no-add-needed/binutils-gold, see
-            # <http://bugs.debian.org/555068> for details.
-            IF(X11_Xrender_FOUND)
-                    LIST(APPEND LIBS ${X11_Xrender_LIB})
-            ENDIF(X11_Xrender_FOUND)
+			# Seems like ${X11_LIBRARIES} doesn't add -lXrender, which is needed
+			# for building with --no-add-needed/binutils-gold, see
+			# <http://bugs.debian.org/555068> for details.
+			IF(X11_Xrender_FOUND)
+				LIST(APPEND LIBS ${X11_Xrender_LIB})
+			ENDIF(X11_Xrender_FOUND)
 		ELSE()
 			SET(CMAKE_STATUS_X11_SUPPORT "Not available")
 		ENDIF()
@@ -741,12 +751,23 @@ ENDIF()
 ############################################################################
 
 INCLUDE(CheckFunctionExists)
-CHECK_FUNCTION_EXISTS("inet_ntoa" HAVE_INET_NTOA)
+CHECK_FUNCTION_EXISTS("inet_ntoa" HAVE_INET_NTOA_EXISTS)
 # what systems lacks this!?
-IF(HAVE_INET_NTOA)
-	ADD_DEFINITIONS(-DHAVE_INET_NTOA)
+IF(HAVE_INET_NTOA_EXISTS)
+	SET(HAVE_INET_NTOA 1)
 ENDIF()
 
+CHECK_FUNCTION_EXISTS("inet_aton" HAVE_INET_ATON_EXISTS)
+# what systems lacks this!?
+IF(HAVE_INET_ATON_EXISTS)
+	SET(HAVE_INET_ATON 1)
+ENDIF()
+
+# Check GET_INTERFACE_ADDRESS support
+FIND_PATH(GET_INTERFACE_ADDRESS_INCLUDE_DIR net/if.h)
+IF(GET_INTERFACE_ADDRESS_INCLUDE_DIR)
+	SET(COMPILE_GET_INTERFACE_ADDRESS 1)
+ENDIF()
 ############################################################################
 # GSM support
 ############################################################################
@@ -763,6 +784,21 @@ ELSE()
 ENDIF()
 
 ############################################################################
+# DCC canvas support
+############################################################################
+
+OPTION(WANT_DCC_CANVAS "Compile DCC Canvas Support" OFF)
+IF(WITH_DCC_CANVAS)
+	SET(WANT_DCC_CANVAS ON)
+ENDIF()
+IF(WANT_DCC_CANVAS)
+	SET(CMAKE_STATUS_DCC_CANVAS_SUPPORT "Yes")
+	SET(COMPILE_DCC_CANVAS 1)
+ELSE()
+	SET(CMAKE_STATUS_DCC_CANVAS_SUPPORT "No")
+ENDIF()
+
+############################################################################
 # DCC voice support
 ############################################################################
 CHECK_INCLUDE_FILE(linux/soundcard.h CMAKE_HAVE_LINUX_SOUNDCARD_H)
@@ -1307,6 +1343,7 @@ MESSAGE(STATUS "  Python Support              : ${CMAKE_STATUS_PYTHON_SUPPORT}")
 MESSAGE(STATUS "  IPC Support                 : ${CMAKE_STATUS_IPC_SUPPORT}")
 MESSAGE(STATUS "  System memmove Support      : ${CMAKE_STATUS_SYSTEM_MEMMOVE_SUPPORT}")
 MESSAGE(STATUS "  GSM Support                 : ${CMAKE_STATUS_GSM_SUPPORT}")
+MESSAGE(STATUS "  DCC Canvas Support          : ${CMAKE_STATUS_DCC_CANVAS_SUPPORT}")
 MESSAGE(STATUS "  DCC Voice Support           : ${CMAKE_STATUS_DCC_VOICE_SUPPORT}")
 MESSAGE(STATUS "  DCC Video Support           : ${CMAKE_STATUS_DCC_VIDEO_SUPPORT}")
 MESSAGE(STATUS "  Ogg/Theora Support          : ${CMAKE_STATUS_OGG_THEORA_SUPPORT}")
diff --git a/cmake/kvi_sysconfig.h.cmake b/cmake/kvi_sysconfig.h.cmake
index aab8278a3..c0bc3fa91 100644
--- a/cmake/kvi_sysconfig.h.cmake
+++ b/cmake/kvi_sysconfig.h.cmake
@@ -18,15 +18,18 @@
 #cmakedefine COMPILE_THREADS_USE_POSIX 1
 #cmakedefine COMPILE_THREADS_USE_WIN32 1
 #cmakedefine COMPILE_THREADS_USE_SOLARIS_LIBTHREAD 1
+#cmakedefine COMPILE_IGNORE_SIGALARM 1
 
 #cmakedefine COMPILE_CRYPT_SUPPORT 1
 #cmakedefine COMPILE_SSL_SUPPORT 1
 #cmakedefine COMPILE_X11_SUPPORT 1
+#cmakedefine COMPILE_XSS_SUPPORT 1
 #cmakedefine COMPILE_IPV6_SUPPORT 1
 #cmakedefine COMPILE_PSEUDO_TRANSPARENCY 1
 #cmakedefine COMPILE_KDE_SUPPORT 1
 #cmakedefine COMPILE_WEBKIT_SUPPORT 1
 #cmakedefine COMPILE_DBUS_SUPPORT 1
+#cmakedefine COMPILE_ZLIB_SUPPORT 1
 
 #cmakedefine COMPILE_PHONON_SUPPORT 1
 #cmakedefine COMPILE_ESD_SUPPORT 1
@@ -34,24 +37,28 @@
 #cmakedefine HAVE_LINUX_SOUNDCARD_H 1
 #cmakedefine HAVE_SYS_SOUNDCARD_H 1
 #cmakedefine HAVE_MACHINE_SOUNDCARD_H 1
+#cmakedefine COMPILE_DCC_CANVAS 1
 #cmakedefine COMPILE_AUDIOFILE_SUPPORT 1
 #cmakedefine COMPILE_DISABLE_DCC_VOICE 1
-#cmakedefine COMPILE_DISABLE_AVDEVICE 1
+#cmakedefine HAVE_LINUX_SOUNDCARD_H 1
+#cmakedefine HAVE_SYS_SOUNDCARD_H 1
+#cmakedefine HAVE_SOUNDCARD_H 1
+
 #cmakedefine COMPILE_DISABLE_DCC_VIDEO 1
+#cmakedefine COMPILE_DISABLE_AVDEVICE 1
 #cmakedefine COMPILE_DISABLE_OGG_THEORA 1
 
 #cmakedefine COMPILE_PERL_SUPPORT 1
 #cmakedefine COMPILE_PYTHON_SUPPORT 1
+
 #if !(defined(MINGW))
 #cmakedefine COMPILE_ix86_ASM 1
 #cmakedefine COMPILE_WITH_SYSTEM_MEMMOVE 1
 #endif
 #cmakedefine COMPILE_USE_DYNAMIC_LABELS 1
-
-#cmakedefine COMPILE_DISABLE_DCC_VOICE 1
-#cmakedefine HAVE_LINUX_SOUNDCARD_H 1
-#cmakedefine HAVE_SYS_SOUNDCARD_H 1
-#cmakedefine HAVE_SOUNDCARD_H 1
+#cmakedefine COMPILE_GET_INTERFACE_ADDRESS 1
+#cmakedefine HAVE_INET_ATON 1
+#cmakedefine HAVE_INET_NTOA 1
 
 #define COMPILE_USE_STANDALONE_MOC_SOURCES 1
 
diff --git a/doc/INSTALL b/doc/INSTALL
index 07ec74521..542041306 100644
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -422,6 +422,11 @@ General notes for the installation of the 4.0 release of KVIrc
         some things faster (this is not always true, depends on the compiler).
         You might want to try it if your KVIrc seems to be really slow...
 
+    -DWITH_IGNORE_SIGALARM
+        Under Solaris, both usleep() and threads implementation are based on
+        SIGALARM. KVIrc uses both, and this could lead to some spontaneous
+        application quits. This option enables a workaround for this problem.
+
     -DWITHOUT_DCC_VOICE
         Explicitly disable the DCC VOICE sound support. This might help
         if you have problems in compilation of src/modules/dcc/voice.cpp.
@@ -430,6 +435,9 @@ General notes for the installation of the 4.0 release of KVIrc
     -DWITH_DCC_VIDEO
         Enables testing DCC VIDEO support.
 
+    -DWITH_DCC_CANVAS
+        Enables DCC CANVAS support.
+
     -DWITH_MEMORY_PROFILE
         Debug stuff...enables memory allocation profiling (don't use it :)
 
@@ -450,21 +458,11 @@ General notes for the installation of the 4.0 release of KVIrc
     -DWITH_BEER
         Add some beers to chat :)
 
-    -DWITH_NO_EMBEDDED_CODE=YES
+    -DWITH_NO_EMBEDDED_CODE
         Use functions from widely tested libraries instead of embedded code or
         reimplementations of codes available from such libraries.
         For required dependencies see section two of this document.
 
-
-# To add here and in main CMakeLists.txt
-COMPILE_DCC_CANVAS
-COMPILE_GET_INTERFACE_ADDRESS
-COMPILE_IGNORE_SIGALARM
-COMPILE_MMX_ASM
-COMPILE_SCRIPTTOOLBAR
-COMPILE_WITH_NO_SOUND
-COMPILE_XSS_SUPPORT
-
 ###############################################################################
 # 4. Interactive mode
 ###############################################################################
diff --git a/src/kvilib/config/kvi_wincfg.h b/src/kvilib/config/kvi_wincfg.h
deleted file mode 100644
index bb9d29ad2..000000000
--- a/src/kvilib/config/kvi_wincfg.h
+++ /dev/null
@@ -1,218 +0,0 @@
-#ifndef _KVI_WINCFG_H_
-#define _KVI_WINCFG_H_
-//=============================================================================
-//
-//   File : kvi_wincfg.h
-//   Creation date : Fri Sep 21 16:21:09 2001 GMT by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-//
-//=============================================================================
-
-/**
-* \file kvi_wincfg.h
-* \author Szymon Stefanek
-* \brief Windows configuration: do not touch
-*/
-
-/** \def COMPILE_NEW_KVS Define if you want to compile with new parser */
-#define COMPILE_NEW_KVS 1
-
-/** \def COMPILE_ONLY_NEW_KVS Define if you want to use only the new KVS parser */
-#define COMPILE_ONLY_NEW_KVS 1
-
-/** \def COMPILE_WITH_NO_SOUND Define if you want to disable DCC VOICE sound support */
-/* #undef COMPILE_WITH_NO_SOUND */
-
-/** \def COMPILE_USE_GSM Define if you have libgsm and want the GSM code to be compiled */
-/* #undef COMPILE_USE_GSM */
-
-/** \def COMPILE_INFO_TIPS Define if you want the info tips to be compiled in */
-/* #define COMPILE_INFO_TIPS 1 */
-
-/** \def COMPILE_KDE_SUPPORT Define if you want to compile the KDE 2.x support */
-/* #undef COMPILE_KDE_SUPPORT */
-
-/** \def COMPILE_MEMORY_PROFILE Define if you want the gcc memory profile */
-/* #undef COMPILE_MEMORY_PROFILE */
-
-/** \def COMPILE_MEMORY_CHECKS Define if you want the memory checks */
-/* #undef COMPILE_MEMORY_CHECKS */
-
-/** \def COMPILE_WITH_SYSTEM_MEMMOVE Define if you trust your memmove() function */
-#define COMPILE_WITH_SYSTEM_MEMMOVE 1
-
-/** \def COMPILE_CRYPT_SUPPORT Define if you want to compile the crypt support */
-#define COMPILE_CRYPT_SUPPORT 1
-
-/** \def COMPILE_ix86_ASM Define if you want the i386 asm code */
-/* #undef COMPILE_ix86_ASM */
-
-/** \def COMPILE_USE_DYNAMIC_LABELS Define if your compiler supports gotos do dynamic labels */
-/* #undef COMPILE_USE_DYNAMIC_LABELS */
-
-/** \def COMPILE_LOCALE_STUFF Define if you want to compile the localization support */
-#define COMPILE_LOCALE_STUFF 1
-
-/** \def COMPILE_IPV6_SUPPORT Define if you want the IPv6 support */
-#define COMPILE_IPV6_SUPPORT 1
-
-/** \def COMPILE_ZLIB_SUPPORT Define if you want zlib support */
-#define COMPILE_ZLIB_SUPPORT 1
-
-/** \def COMPILE_THREADS_USE_POSIX Define if you want to use the pthreads library */
-/* #undef COMPILE_THREADS_USE_POSIX */
-
-/** \def COMPILE_THREADS_USE_SOLARIS_LIBTHREAD Define if you want to use the solaris libthread */
-/* #undef COMPILE_THREADS_USE_SOLARIS_LIBTHREAD */
-
-/** \def COMPILE_PSEUDO_TRANSPARENCY Define if you want the pseudo transparency */
-#define COMPILE_PSEUDO_TRANSPARENCY
-
-/** \def COMPILE_GET_INTERFACE_ADDRESS Define if you have the SIOCGIFADDR ioctl and the related headers */
-/* #undef COMPILE_GET_INTERFACE_ADDRESS */
-
-/** \def KVIRC_BUILD_DATE This is the build date (configure date rather) */
-#define KVIRC_BUILD_DATE __DATE__" "__TIME__
-
-/** \def KVIRC_BUILD_FLAGS This is a build flag */
-#define KVIRC_BUILD_FLAGS "win32"
-/** \def KVIRC_BUILD_COMMAND This is a build flag */
-#define KVIRC_BUILD_COMMAND "win32"
-/** \def KVIRC_BUILD_SYSTEM This is a build flag */
-#define KVIRC_BUILD_SYSTEM "win32"
-/** \def KVIRC_BUILD_CPU This is a build flag */
-#define KVIRC_BUILD_CPU "win32"
-/** \def KVIRC_BUILD_COMPILER This is a build flag */
-#define KVIRC_BUILD_COMPILER "win32"
-/** \def KVIRC_BUILD_COMPILER_FLAGS This is a build flag */
-#define KVIRC_BUILD_COMPILER_FLAGS "win32"
-
-/** \def HAVE_STRINGS_H Define if you have strings.h */
-/* #undef HAVE_STRINGS_H */
-
-/** \def HAVE_GETENV Define if you have the getenv function */
-/* #undef HAVE_GETENV */
-
-/** \def HAVE_STRERROR Define if you have the strerror function */
-#define HAVE_STRERROR 1
-
-/** \def HAVE_INET_ATON Define if you have the inet_aton function */
-/* #define HAVE_INET_ATON 1 */
-
-/** \def HAVE_INET_NTOA Define if you have the inet_ntoa function */
-/* #define HAVE_INET_NTOA 1 */
-
-/** \def HAVE_INET_PTON Define if you have the inet_pton function */
-/* #undef HAVE_INET_PTON */
-
-/** \def HAVE_INET_NTOP Define if you have the inet_ntop function */
-/* #undef HAVE_INET_NTOP */
-
-/** \def HAVE_GETNAMEINFO Define if you have the getnameinfo function */
-#define HAVE_GETNAMEINFO
-
-/** \def HAVE_GETADDRINFO Define if you have the getaddrinfo function */
-#define HAVE_GETADDRINFO
-
-/** \def AVERAGE_CHANNEL_USERS Define this to the number of average channel users */
-#define AVERAGE_CHANNEL_USERS 101
-
-/** \def COMPILE_IGNORE_SIGALARM Define this if you want to ignore the SIGALARM signal */
-/* #undef COMPILE_IGNORE_SIGALARM */
-
-/** \def BIG_ENDIAN_MACHINE_BYTE_ORDER Define this if you are on a big endian machine */
-/* #undef BIG_ENDIAN_MACHINE_BYTE_ORDER */
-
-/** \def COMPILE_USE_LOCAL_8BIT Define this if you want to use the unicode-local 8bit charset translation */
-/* #undef COMPILE_USE_LOCAL_8BIT */
-
-/** \def COMPILE_NO_IPC Define this if you want to disable the inter-process communication support */
-/* #undef COMPILE_NO_IPC */
-
-/** \def HAVE_GETENV Define if you have the `getenv' function. */
-/* #undef HAVE_GETENV */
-
-/** \def HAVE_LINUX_SOUNDCARD_H Define if you have the <linux/soundcard.h> header file. */
-/* #undef HAVE_LINUX_SOUNDCARD_H */
-
-/** \def HAVE_SOUNDCARD_H Define if you have the <soundcard.h> header file. */
-/* #undef HAVE_SOUNDCARD_H */
-
-/** \def HAVE_SYS_SOUNDCARD_H Define if you have the <sys/soundcard.h> header file. */
-/* #undef HAVE_SYS_SOUNDCARD_H */
-
-/** \def PACKAGE Name of package */
-#define PACKAGE "kvirc"
-
-/** \def VERSION Version number of package */
-#define VERSION "4.0.0"
-
-/** \def VERSION_BRANCH Version branch number of package */
-#define VERSION_BRANCH "4.0"
-
-/** \def _POSIX_1_SOURCE Define if the system does not provide POSIX.1 features except with this defined. */
-/* #undef _POSIX_1_SOURCE */
-
-/** \def _POSIX_SOURCE Define if you need to in order for `stat' and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/** \def COMPILE_WITH_NO_SOUND Define if you want DCC Voice support */
-// for now we need this....dcc voice is not ported yet
-#define COMPILE_WITH_NO_SOUND
-
-/** \def COMPILE_DISABLE_DCC_VOICE Define if you don't want DCC Voice support */
-#define COMPILE_DISABLE_DCC_VOICE
-
-/** \def COMPILE_NO_X No X support */
-#define COMPILE_NO_X
-
-/** \def COMPILE_NO_X_BELL No X bell! */
-#define COMPILE_NO_X_BELL
-
-/** \def COMPILE_SSL_SUPPORT Define if you have openssl and want the ssl support in kvirc */
-#define COMPILE_SSL_SUPPORT
-
-/** \def COMPILE_PERL_SUPPORT Define if you want perl scripting support */
-#define COMPILE_PERL_SUPPORT
-
-/** \def SIZEOF_INT The size of a `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/** \def SIZEOF_LONG_INT The size of a `long int', as computed by sizeof. */
-#define SIZEOF_LONG_INT 4
-
-/** \def SIZEOF_LONG_LONG_INT The size of a `long long int', as computed by sizeof. */
-#define SIZEOF_LONG_LONG_INT 8
-
-/** \def SIZEOF_SHORT_INT The size of a `short int', as computed by sizeof. */
-#define SIZEOF_SHORT_INT 2
-
-/** \def SIZEOF_UNSIGNED_INT The size of a `unsigned int', as computed by sizeof. */
-#define SIZEOF_UNSIGNED_INT 4
-
-/** \def SIZEOF_UNSIGNED_LONG_INT The size of a `unsigned long int', as computed by sizeof. */
-#define SIZEOF_UNSIGNED_LONG_INT 4
-
-/** \def SIZEOF_UNSIGNED_LONG_LONG_INT The size of a `unsigned long long int', as computed by sizeof. */
-#define SIZEOF_UNSIGNED_LONG_LONG_INT 8
-
-/** \def SIZEOF_UNSIGNED_SHORT_INT The size of a `unsigned short int', as computed by sizeof. */
-#define SIZEOF_UNSIGNED_SHORT_INT 2
-
-#endif //_KVI_WINCFG_H_
diff --git a/src/kvilib/core/kvi_memmove.h b/src/kvilib/core/kvi_memmove.h
index dfa170596..4f9360650 100644
--- a/src/kvilib/core/kvi_memmove.h
+++ b/src/kvilib/core/kvi_memmove.h
@@ -28,9 +28,6 @@
 
 #include "kvi_settings.h"
 
-//#undef COMPILE_WITH_SYSTEM_MEMMOVE
-//#define COMPILE_MMX_ASM
-
 #ifndef _KVI_MEMMOVE_CPP_
 
 	#ifdef COMPILE_WITH_SYSTEM_MEMMOVE
diff --git a/src/kvilib/net/kvi_netutils.cpp b/src/kvilib/net/kvi_netutils.cpp
index 7bf06b9af..dc3e75619 100644
--- a/src/kvilib/net/kvi_netutils.cpp
+++ b/src/kvilib/net/kvi_netutils.cpp
@@ -58,7 +58,7 @@
 
 // FIXME: #warning "Your system lacks the inet_aton function,"
 // FIXME: #warning "you're trying to compile this file without"
-// FIXME: #warning "the config.h created by the configure script,"
+// FIXME: #warning "the kvi_sysconfig.h created by the cmake script,"
 // FIXME: #warning "Using own internal implementation of inet_aton."
 
 #include <ctype.h>
@@ -570,7 +570,7 @@ namespace KviNetUtils
 	}
 
 #ifdef COMPILE_GET_INTERFACE_ADDRESS
-	bool getInterfaceAddress(const QString &szInterfaceName,QString &)
+	bool getInterfaceAddress(const QString &szInterfaceName,QString &szBuffer)
 	{
 		struct sockaddr *sa;
 		struct sockaddr_in *sin;
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
index 047f1499c..e3b1244c2 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
@@ -1001,6 +1001,9 @@ namespace KviKvsCoreFunctions
 	#ifndef COMPILE_DISABLE_DCC_VOICE
 			"DCCVoice",
 	#endif
+	#ifdef COMPILE_DCC_CANVAS
+			"DCCCanvas",
+	#endif
 			"Qt4",
 			"KVS",
 			0
diff --git a/src/modules/objects/class_widget.h b/src/modules/objects/class_widget.h
index 036b581a5..d8eddf1cb 100644
--- a/src/modules/objects/class_widget.h
+++ b/src/modules/objects/class_widget.h
@@ -25,6 +25,7 @@
 //
 //=============================================================================
 
+#include "kvi_settings.h"
 #include "kvi_string.h"
 #include "kvi_tal_tooltip.h"
 #include "object_macros.h"