@@ -871,7 +871,6 @@ int VSIWin32FilesystemHandler::Stat(const char *pszFilename,
871871 VSIStatBufL *pStatBuf, int nFlags)
872872
873873{
874- #if defined(_MSC_VER) || __MSVCRT_VERSION__ >= 0x0601
875874 if (CPLTestBool (CPLGetConfigOption (" GDAL_FILENAME_IS_UTF8" , " YES" )))
876875 {
877876 wchar_t *pwszFilename =
@@ -936,7 +935,6 @@ int VSIWin32FilesystemHandler::Stat(const char *pszFilename,
936935 return nResult;
937936 }
938937 else
939- #endif
940938 {
941939 (void )nFlags;
942940 return (VSI_STAT64 (pszFilename, pStatBuf));
@@ -951,7 +949,6 @@ int VSIWin32FilesystemHandler::Stat(const char *pszFilename,
951949int VSIWin32FilesystemHandler::Unlink (const char *pszFilename)
952950
953951{
954- #if defined(_MSC_VER) || __MSVCRT_VERSION__ >= 0x0601
955952 if (CPLTestBool (CPLGetConfigOption (" GDAL_FILENAME_IS_UTF8" , " YES" )))
956953 {
957954 wchar_t *pwszFilename =
@@ -962,7 +959,6 @@ int VSIWin32FilesystemHandler::Unlink(const char *pszFilename)
962959 return nResult;
963960 }
964961 else
965- #endif
966962 {
967963 return unlink (pszFilename);
968964 }
@@ -975,7 +971,6 @@ int VSIWin32FilesystemHandler::Unlink(const char *pszFilename)
975971int VSIWin32FilesystemHandler::Rename (const char *oldpath, const char *newpath)
976972
977973{
978- #if defined(_MSC_VER) || __MSVCRT_VERSION__ >= 0x0601
979974 if (CPLTestBool (CPLGetConfigOption (" GDAL_FILENAME_IS_UTF8" , " YES" )))
980975 {
981976 wchar_t *pwszOldPath =
@@ -989,7 +984,6 @@ int VSIWin32FilesystemHandler::Rename(const char *oldpath, const char *newpath)
989984 return nResult;
990985 }
991986 else
992- #endif
993987 {
994988 return rename (oldpath, newpath);
995989 }
@@ -999,11 +993,9 @@ int VSIWin32FilesystemHandler::Rename(const char *oldpath, const char *newpath)
999993/* Mkdir() */
1000994/* ***********************************************************************/
1001995
1002- int VSIWin32FilesystemHandler::Mkdir (const char *pszPathname, long nMode)
996+ int VSIWin32FilesystemHandler::Mkdir (const char *pszPathname, long /* nMode */ )
1003997
1004998{
1005- (void )nMode;
1006- #if defined(_MSC_VER) || __MSVCRT_VERSION__ >= 0x0601
1007999 if (CPLTestBool (CPLGetConfigOption (" GDAL_FILENAME_IS_UTF8" , " YES" )))
10081000 {
10091001 wchar_t *pwszFilename =
@@ -1014,7 +1006,6 @@ int VSIWin32FilesystemHandler::Mkdir(const char *pszPathname, long nMode)
10141006 return nResult;
10151007 }
10161008 else
1017- #endif
10181009 {
10191010 return mkdir (pszPathname);
10201011 }
@@ -1027,7 +1018,6 @@ int VSIWin32FilesystemHandler::Mkdir(const char *pszPathname, long nMode)
10271018int VSIWin32FilesystemHandler::Rmdir (const char *pszPathname)
10281019
10291020{
1030- #if defined(_MSC_VER) || __MSVCRT_VERSION__ >= 0x0601
10311021 if (CPLTestBool (CPLGetConfigOption (" GDAL_FILENAME_IS_UTF8" , " YES" )))
10321022 {
10331023 wchar_t *pwszFilename =
@@ -1038,7 +1028,6 @@ int VSIWin32FilesystemHandler::Rmdir(const char *pszPathname)
10381028 return nResult;
10391029 }
10401030 else
1041- #endif
10421031 {
10431032 return rmdir (pszPathname);
10441033 }
@@ -1051,7 +1040,6 @@ int VSIWin32FilesystemHandler::Rmdir(const char *pszPathname)
10511040char **VSIWin32FilesystemHandler::ReadDirEx (const char *pszPath, int nMaxFiles)
10521041
10531042{
1054- #if defined(_MSC_VER) || __MSVCRT_VERSION__ >= 0x0601
10551043 if (CPLTestBool (CPLGetConfigOption (" GDAL_FILENAME_IS_UTF8" , " YES" )))
10561044 {
10571045 struct _wfinddata_t c_file;
@@ -1091,7 +1079,6 @@ char **VSIWin32FilesystemHandler::ReadDirEx(const char *pszPath, int nMaxFiles)
10911079 return oDir.StealList ();
10921080 }
10931081 else
1094- #endif
10951082 {
10961083 struct _finddata_t c_file;
10971084 intptr_t hFile;
@@ -1192,7 +1179,6 @@ bool VSIWin32FilesystemHandler::IsLocal(const char *pszPath)
11921179std::string VSIWin32FilesystemHandler::GetCanonicalFilename (
11931180 const std::string &osFilename) const
11941181{
1195- #if defined(_MSC_VER) || __MSVCRT_VERSION__ >= 0x0601
11961182 if (CPLTestBool (CPLGetConfigOption (" GDAL_FILENAME_IS_UTF8" , " YES" )))
11971183 {
11981184 wchar_t *pwszFilename =
@@ -1208,7 +1194,6 @@ std::string VSIWin32FilesystemHandler::GetCanonicalFilename(
12081194 return osRet;
12091195 }
12101196 else
1211- #endif
12121197 {
12131198 char longPath[MAX_PATH];
12141199 DWORD result = GetLongPathNameA (osFilename.c_str (), longPath, MAX_PATH);
0 commit comments