4.54 beta

CPP/7zip/UI/Client7z/Client7z.cpp

@@ -2,8 +2,7 @@
 
 #include "StdAfx.h"
 
-#include <initguid.h>
-
+#include "Common/MyInitGuid.h"
 #include "Common/StringConvert.h"
 #include "Common/IntToString.h"
 
@@ -45,6 +44,7 @@ typedef UINT32 (WINAPI * CreateObjectFunc)(
     const GUID *interfaceID, 
     void **outObject);
 
+#ifdef _WIN32
 #ifndef _UNICODE
 bool g_IsNT = false;
 static inline bool IsItWindowsNT()
@@ -56,6 +56,7 @@ static inline bool IsItWindowsNT()
   return (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT);
 }
 #endif
+#endif
 
 void PrintString(const UString &s)
 {
@@ -678,9 +679,11 @@ __cdecl
 #endif
 main(int argc, char* argv[])
 {
+  #ifdef _WIN32
   #ifndef _UNICODE
   g_IsNT = IsItWindowsNT();
   #endif
+  #endif
 
   PrintStringLn(kCopyrightString);