From 606f6c0e74df01c1f7902ef0eb99bef669e95c23 Mon Sep 17 00:00:00 2001 From: Alberto Fustinoni Date: Sun, 23 Oct 2016 23:25:16 +0900 Subject: [PATCH] Better define guards --- taglib/toolkit/tfilestream.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/taglib/toolkit/tfilestream.cpp b/taglib/toolkit/tfilestream.cpp index cd582d06..19199c10 100644 --- a/taglib/toolkit/tfilestream.cpp +++ b/taglib/toolkit/tfilestream.cpp @@ -52,13 +52,13 @@ namespace const DWORD access = readOnly ? GENERIC_READ : (GENERIC_READ | GENERIC_WRITE); if(!path.wstr().empty()) -#if (_WIN32_WINNT >= 0x0602) +#if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0602) return CreateFile2(path.wstr().c_str(), access, FILE_SHARE_READ, OPEN_EXISTING, NULL); #else return CreateFileW(path.wstr().c_str(), access, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); #endif else if(!path.str().empty()) -#if (_WIN32_WINNT >= 0x0602) +#if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0602) return CreateFile2(path.toString().toCWString(), access, FILE_SHARE_READ, OPEN_EXISTING, NULL); #else return CreateFileA(path.str().c_str(), access, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); @@ -445,7 +445,7 @@ long FileStream::length() #ifdef _WIN32 SetLastError(NO_ERROR); -#if (_WIN32_WINNT >= 0x0602) +#if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0602) LARGE_INTEGER fSize; GetFileSizeEx(d->file, &fSize); LONGLONG fileSize = fSize.QuadPart; -- 2.40.0