diff options
| author |  Robert Förster | 2013-03-26 09:20:57 +0000 |
|---|---|---|
| committer | Robert Förster | 2013-03-26 09:20:57 +0000 |
| commit | 28297f05e938ae7c8a49f7caa58ca426626174f5 (patch) | |
| tree | cbb23e9d064c68dbb18aa5e80551e89560d6fde5 | |
| parent | Fix help of functions in $objects. Thanks to alexzulu for the patch. (diff) | |
| download | KVIrc-28297f05e938ae7c8a49f7caa58ca426626174f5.tar.gz KVIrc-28297f05e938ae7c8a49f7caa58ca426626174f5.tar.bz2 KVIrc-28297f05e938ae7c8a49f7caa58ca426626174f5.zip | |
some warning fixes for sunpro, and a compile fix, sunpro is still dumb and broken but its a start
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6322 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/kvilib/core/KviQString.h | 2 | ||||
| -rw-r--r-- | src/kvilib/net/KviNetUtils.cpp | 4 | ||||
| -rw-r--r-- | src/kvirc/ui/KviWindow.h | 2 | ||||
| -rw-r--r-- | src/modules/logview/LogFile.h | 8 |
5 files changed, 15 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 090ddaf02..a92bca59d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -985,7 +985,7 @@ else() endif() ############################################################################ -# Win32 mingw/cmake build checks +# Platform Specific checks ############################################################################ if(WIN32) add_definitions(-D_WIN32_WINNT=0x501 -DWINVER=0x501) @@ -1004,6 +1004,10 @@ if(MSVC) add_definitions(-DMSVC) endif() +if(${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro") + add_definitions(-DSOLARIS) +endif() + ############################################################################ # Very important checks ############################################################################ diff --git a/src/kvilib/core/KviQString.h b/src/kvilib/core/KviQString.h index d5d36d73e..7e62ce0dd 100644 --- a/src/kvilib/core/KviQString.h +++ b/src/kvilib/core/KviQString.h @@ -56,7 +56,7 @@ namespace KviQString PermitVariables = 2, /**< escapes '%' character to permit variables */ PermitFunctions = 4, /**< escapes '$' character to permit functions */ PermitMultiLine = 8, /**< escapes '\r' and '\n' characters */ - EscapeParenthesis = 16, /**< escapes parenthesis */ + EscapeParenthesis = 16 /**< escapes parenthesis */ }; /** diff --git a/src/kvilib/net/KviNetUtils.cpp b/src/kvilib/net/KviNetUtils.cpp index 150a914f6..39214014a 100644 --- a/src/kvilib/net/KviNetUtils.cpp +++ b/src/kvilib/net/KviNetUtils.cpp @@ -41,6 +41,10 @@ #include <sys/types.h> +#ifdef SOLARIS + #include <sys/sockio.h> +#endif + #ifdef COMPILE_GET_INTERFACE_ADDRESS #include <sys/ioctl.h> #include <net/if.h> diff --git a/src/kvirc/ui/KviWindow.h b/src/kvirc/ui/KviWindow.h index a20193fcc..f95f3175f 100644 --- a/src/kvirc/ui/KviWindow.h +++ b/src/kvirc/ui/KviWindow.h @@ -122,7 +122,7 @@ public: */ enum AttentionLevel { VisibleAndActive = 0, /**< The window is visible and active (aka: has user focus) */ - MainWindowIsVisible = 1, /**< The kvirc frame is visible but the window is not the active one */ + MainWindowIsVisible = 1 /**< The kvirc frame is visible but the window is not the active one */ }; /** * \enum Type diff --git a/src/modules/logview/LogFile.h b/src/modules/logview/LogFile.h index a81f9e113..7a8cafebc 100644 --- a/src/modules/logview/LogFile.h +++ b/src/modules/logview/LogFile.h @@ -70,7 +70,7 @@ public: Console = 1, /**< the log file of a console */ Query = 2, /**< the log file of a query */ DccChat = 3, /**< the log file of a dcc chat */ - Other = 4, /**< any other log file */ + Other = 4 /**< any other log file */ }; /** @@ -79,9 +79,9 @@ public: */ enum ExportType { PlainText, /**< export log in plain text file */ - HTML, /**< export log in a HTML archive */ - //XML, /**< export log in a XML file */ - //DB /**< export log in a database file */ + HTML /**< export log in a HTML archive */ + //XML /**< export log in a XML file */ + //DB /**< export log in a database file */ }; /** |