X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6deb397d295d969d2222270505206a8ded930f3f..cdbce971ecd2a3f39ddcc56c0ef7769663fbdf23:/src/msw/utils.cpp

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index d5a9de6069..cc998c4242 100644
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -951,7 +951,7 @@ bool wxShutdown(wxShutdownFlags WXUNUSED_IN_WINCE(wFlags))
 #elif defined(__WIN32__)
     bool bOK = true;
 
-    if ( wxGetOsVersion(NULL, NULL) == wxWINDOWS_NT ) // if is NT or 2K
+    if ( wxGetOsVersion(NULL, NULL) == wxOS_WINDOWS_NT ) // if is NT or 2K
     {
         // Get a token for this process.
         HANDLE hToken;
@@ -1171,13 +1171,13 @@ bool wxIsPlatform64Bit()
     typedef BOOL (WINAPI *IsWow64Process_t)(HANDLE, BOOL *);
 
     wxDynamicLibrary dllKernel32(_T("kernel32.dll"));
-    IsWow64Process_t *pfnIsWow64Process =
-        (IsWow64Process_t *)dllKernel32.RawGetSymbol(_T("IsWow64Process"));
+    IsWow64Process_t pfnIsWow64Process =
+        (IsWow64Process_t)dllKernel32.RawGetSymbol(_T("IsWow64Process"));
 
     BOOL wow64 = FALSE;
     if ( pfnIsWow64Process )
     {
-        (*pfnIsWow64Process)(::GetCurrentProcess(), &wow64);
+        pfnIsWow64Process(::GetCurrentProcess(), &wow64);
     }
     //else: running under a system without Win64 support
 
@@ -1221,7 +1221,7 @@ wxWinVersion wxGetWinVersion()
         verMin;
     switch ( wxGetOsVersion(&verMaj, &verMin) )
     {
-        case wxWIN95:
+        case wxOS_WINDOWS_9X:
             if ( verMaj == 4 )
             {
                 switch ( verMin )
@@ -1238,7 +1238,7 @@ wxWinVersion wxGetWinVersion()
             }
             break;
 
-        case wxWINDOWS_NT:
+        case wxOS_WINDOWS_NT:
             switch ( verMaj )
             {
                 case 3: