From: Alberto Fustinoni <alberto@aftnet.net>
Date: Sun, 23 Oct 2016 14:25:16 +0000 (+0900)
Subject: Better define guards
X-Git-Tag: v1.12-beta-1~142^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=606f6c0e74df01c1f7902ef0eb99bef669e95c23;p=taglib

Better define guards
---

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;