diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-11-26 23:30:25 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-05-19 03:43:25 +0200 |
| commit | 937344a0e4dcdd3f805532b6cd43e06cbd362b32 (patch) | |
| tree | 40ec04184b5bf3a086286f74010895f341c90043 /onlineupdate | |
| parent | ab6ed35d4e4b31a02d419d6b64217a1fc9728420 (diff) | |
more XP_WIN to _WIN32
Change-Id: If2dd733f44675e1f4305afff84a1b16f8c8ff1c5
Diffstat (limited to 'onlineupdate')
| -rw-r--r-- | onlineupdate/source/update/updater/updater.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/onlineupdate/source/update/updater/updater.cxx b/onlineupdate/source/update/updater/updater.cxx index 2d775aff74bc..3b90dbe4c54f 100644 --- a/onlineupdate/source/update/updater/updater.cxx +++ b/onlineupdate/source/update/updater/updater.cxx @@ -1630,7 +1630,7 @@ PatchFile::Execute() // Go ahead and do a bit of cleanup now to minimize runtime overhead. // Make sure mPatchStream gets unlocked on Windows; the system will do that, // but not until some indeterminate future time, and we want determinism. -#ifdef XP_WIN +#ifdef _WIN32 UnlockFile((HANDLE)_get_osfhandle(fileno(mPatchStream)), (DWORD)0, (DWORD)0, (DWORD)-1, (DWORD)-1); #endif // Set mPatchStream to nullptr to make AutoFile close the file, @@ -3344,7 +3344,7 @@ int NS_main(int argc, NS_tchar **argv) NS_tmkdir(gDeleteDirPath, 0755); } } -#endif /* XP_WIN */ +#endif /* _WIN32 */ // Run update process on a background thread. ShowProgressUI may return // before QuitProgressUI has been called, so wait for UpdateThreadFunc to @@ -3360,7 +3360,7 @@ int NS_main(int argc, NS_tchar **argv) } t.join(); -#ifdef XP_WIN +#ifdef _WIN32 if (argc > callbackIndex && !sReplaceRequest) { if (callbackFile != INVALID_HANDLE_VALUE) { CloseHandle(callbackFile); @@ -3447,7 +3447,7 @@ int NS_main(int argc, NS_tchar **argv) LogFinish(); int retVal = LaunchCallbackAndPostProcessApps(argc, argv, callbackIndex -#ifdef XP_WIN +#ifdef _WIN32 , elevatedLockFilePath , updateLockFileHandle #elif XP_MACOSX |