Commit 0e13cf3f authored by Orgad Shaneh's avatar Orgad Shaneh Committed by hjk
Browse files

Fix warnings



Warnings came up using MinGW 4.4:
* botan.cpp: integer constant is too large for 'long' type
* dnssd_clientlib.c, dnssd_clientstub.c: ignoring #pragma warning
* hostutils.cpp: comparison between signed and unsigned integer expressions
* qmakebuildins.cpp: 'QString windowsErrorCode()' defined but not used

Change-Id: I80827f7f740ff380f13cef96d6b43baaa7e179cb
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent e7605b46
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -36,8 +36,10 @@
#endif
#if defined(_WIN32)
#ifdef _MSC_VER
// disable warning "conversion from <data> to uint16_t"
#pragma warning(disable:4244)
#endif
#define strncasecmp _strnicmp
#define strcasecmp _stricmp
#endif
......
......@@ -56,11 +56,13 @@ static int gDaemonErr = kDNSServiceErr_NoError;
#define sockaddr_mdns sockaddr_in
#define AF_MDNS AF_INET
#ifdef _MSC_VER
// Disable warning: "'type cast' : from data pointer 'void *' to function pointer"
#pragma warning(disable:4055)
// Disable warning: "nonstandard extension, function/data pointer conversion in expression"
#pragma warning(disable:4152)
#endif
//extern BOOL IsSystemServiceDisabled();
......
......@@ -206,7 +206,7 @@ void formatWindowsException(unsigned long code, quint64 address,
str.setIntegerBase(10);
}
bool isDebuggerWinException(long code)
bool isDebuggerWinException(unsigned long code)
{
return code == EXCEPTION_BREAKPOINT || code == EXCEPTION_SINGLE_STEP;
}
......
......@@ -74,7 +74,7 @@ void formatWindowsException(unsigned long code, quint64 address,
bool isFatalWinException(long code);
// Check for EXCEPTION_BREAKPOINT, EXCEPTION_SINGLE_STEP
bool isDebuggerWinException(long code);
bool isDebuggerWinException(unsigned long code);
#endif // defined(Q_OS_WIN)
......
......@@ -184,7 +184,7 @@ static bool isTrue(const ProString &_str, QString &tmp)
return !str.compare(statics.strtrue, Qt::CaseInsensitive) || str.toInt();
}
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) && defined(PROEVALUATOR_FULL)
static QString windowsErrorCode()
{
wchar_t *string = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment