Bug 680865 - TestDllInterceptor.cpp fails to compile on mingw r=glandium
authorJacek Caban <jacek@codeweavers.com>
Mon, 22 Aug 2011 14:18:52 +0200
changeset 75642 98f26632de7f4151d43a29b374ccad61fda539dd
parent 75641 7b7109b4bfb722b984e7e0869612000dfdc8bda7
child 75643 92b574170b330d2feaebcc5349fc7d834f93dd7d
push id1377
push userjacek@codeweavers.com
push dateMon, 22 Aug 2011 12:23:57 +0000
treeherdermozilla-inbound@92b574170b33 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs680865
milestone9.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 680865 - TestDllInterceptor.cpp fails to compile on mingw r=glandium
toolkit/xre/test/win/TestDllInterceptor.cpp
--- a/toolkit/xre/test/win/TestDllInterceptor.cpp
+++ b/toolkit/xre/test/win/TestDllInterceptor.cpp
@@ -35,35 +35,35 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include <stdio.h>
 #include "nsWindowsDllInterceptor.h"
 
 static bool patched_func_called = false;
 
-static BOOL (WINAPI *orig_GetVersionExA)(__inout LPOSVERSIONINFO);
+static BOOL (WINAPI *orig_GetVersionExA)(LPOSVERSIONINFO);
 
 static BOOL WINAPI
-patched_GetVersionExA(__inout LPOSVERSIONINFO lpVersionInfo)
+patched_GetVersionExA(LPOSVERSIONINFO lpVersionInfo)
 {
   patched_func_called = true;
   return orig_GetVersionExA(lpVersionInfo);
 }
 
 bool osvi_equal(OSVERSIONINFO &info0, OSVERSIONINFO &info1)
 {
   return (info0.dwMajorVersion == info1.dwMajorVersion &&
           info0.dwMinorVersion == info1.dwMinorVersion &&
           info0.dwBuildNumber == info1.dwBuildNumber &&
           info0.dwPlatformId == info1.dwPlatformId &&
           !strncmp(info0.szCSDVersion, info1.szCSDVersion, sizeof(info0.szCSDVersion)));
 }
 
-int wmain()
+int main()
 {
   OSVERSIONINFO info0, info1;
   ZeroMemory(&info0, sizeof(OSVERSIONINFO));
   ZeroMemory(&info1, sizeof(OSVERSIONINFO));
   info0.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
   info1.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 
   GetVersionExA(&info0);