From e0453d1b7e38a09e861ee1e57bf6da0d2a186ef6 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Tue, 31 Dec 2019 11:10:31 -0500 Subject: [PATCH] Fix redefinition compilation error on Windows --- src/FileNames.cpp | 2 +- src/FileNames.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/FileNames.cpp b/src/FileNames.cpp index ab4c462bd..8ad99ac1a 100644 --- a/src/FileNames.cpp +++ b/src/FileNames.cpp @@ -693,7 +693,7 @@ void FileNames::FindFilesInPathList(const wxString & pattern, } #if defined(__WXMSW__) -wxCharBuffer FileNames::mFilename; +static wxCharBuffer mFilename; // // On Windows, wxString::mb_str() can return a NULL pointer if the diff --git a/src/FileNames.h b/src/FileNames.h index 602f71bb0..c1523f78b 100644 --- a/src/FileNames.h +++ b/src/FileNames.h @@ -178,9 +178,6 @@ namespace FileNames * on Windows */ #if defined(__WXMSW__) char *VerifyFilename(const wxString &s, bool input = true); - - // stuff for file name sanitisation - wxCharBuffer mFilename; #endif };