mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

os_win.cpp: Fix PATH_MAX redefinition warning

Browse Source 
The macro should be undefined and then defined again to change its value, but it's better if we use a dedicated macro instead.
This fixes the following warning when compiling with MinGW:
warning: "PATH_MAX" redefined
This commit is contained in:
Davide Beatrici 2017-01-31 12:03:41 +01:00
parent 039096acf5
commit 2966e5f530
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mumble/os_win.cpp
View File

@ -20,12 +20,12 @@ extern "C" {
void mumble_speex_init();
};
#define PATH_MAX 1024
#define DUMP_BUFFER_SIZE 1024
static wchar_t wcCrashDumpPath[PATH_MAX];
static wchar_t wcCrashDumpPath[DUMP_BUFFER_SIZE];
static FILE *fConsole = NULL;
static wchar_t wcComment[PATH_MAX] = L"";
static wchar_t wcComment[DUMP_BUFFER_SIZE] = L"";
static MINIDUMP_USER_STREAM musComment;
static QSharedPointer<LogEmitter> le;
@ -269,7 +269,7 @@ void os_init() {
QString comment = QString::fromLatin1("%1\n%2\n%3").arg(QString::fromLatin1(MUMBLE_RELEASE), QString::fromLatin1(MUMTEXT(MUMBLE_VERSION_STRING)), hash);
wcscpy_s(wcComment, PATH_MAX, comment.toStdWString().c_str());
wcscpy_s(wcComment, DUMP_BUFFER_SIZE, comment.toStdWString().c_str());
musComment.Type = CommentStreamW;
musComment.Buffer = wcComment;
musComment.BufferSize = static_cast<ULONG>(wcslen(wcComment) * sizeof(wchar_t));
@ -279,7 +279,7 @@ void os_init() {
QFileInfo fi(dump);
QDir::root().mkpath(fi.absolutePath());
if (wcscpy_s(wcCrashDumpPath, PATH_MAX, dump.toStdWString().c_str()) == 0)
if (wcscpy_s(wcCrashDumpPath, DUMP_BUFFER_SIZE, dump.toStdWString().c_str()) == 0)
SetUnhandledExceptionFilter(MumbleUnhandledExceptionFilter);
#endif