X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22f3361e1cf25c52a2da8fdfc5cb081809e18fb9..581bebd192cbdf8b638ee1c7ed70fa602242b7a1:/src/msw/utils.cpp diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index 271a75da76..986e6602bf 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -48,7 +48,7 @@ #include "wx/timer.h" -#if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) +#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) #include <direct.h> #ifndef __MWERKS__ @@ -78,8 +78,10 @@ #include <lm.h> #endif // USE_NET_API -#if defined(__WIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__) - #include <io.h> +#if defined(__WIN32__) && !defined(__WXMICROWIN__) + #ifndef __UNIX__ + #include <io.h> + #endif #ifndef __GNUWIN32__ #include <shellapi.h> @@ -887,7 +889,6 @@ bool wxShutdown(wxShutdownFlags wFlags) bOK = ::OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken) != 0; -#ifndef __WXWINE__ if ( bOK ) { TOKEN_PRIVILEGES tkp; @@ -906,7 +907,6 @@ bool wxShutdown(wxShutdownFlags wFlags) // Cannot test the return value of AdjustTokenPrivileges. bOK = ::GetLastError() == ERROR_SUCCESS; } -#endif } if ( bOK )