From 384f96111e764e51b07f47a3059c0cc4d3eb0f46 Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Wed, 24 May 2000 23:56:47 +0000 Subject: [PATCH] Using WINAPI macro for callback routines. Thanks to juberti@aol.com and jesusx@who.net for the help and moral support. r=mozbot a=mozbot git-svn-id: svn://10.0.0.236/trunk@70772 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/gfx/src/windows/nsScreenManagerWin.cpp | 4 ++-- mozilla/gfx/src/windows/nsScreenWin.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mozilla/gfx/src/windows/nsScreenManagerWin.cpp b/mozilla/gfx/src/windows/nsScreenManagerWin.cpp index 4f3a466767e..155596a71e6 100644 --- a/mozilla/gfx/src/windows/nsScreenManagerWin.cpp +++ b/mozilla/gfx/src/windows/nsScreenManagerWin.cpp @@ -41,8 +41,8 @@ #if _MSC_VER >= 1200 -typedef HMONITOR (*MonitorFromRectProc)(LPCRECT inRect, DWORD inFlag); -typedef BOOL (*EnumDisplayMonitorsProc)(HDC, LPCRECT, MONITORENUMPROC, LPARAM); +typedef HMONITOR (WINAPI *MonitorFromRectProc)(LPCRECT inRect, DWORD inFlag); +typedef BOOL (WINAPI *EnumDisplayMonitorsProc)(HDC, LPCRECT, MONITORENUMPROC, LPARAM); BOOL CALLBACK CountMonitors ( HMONITOR, HDC, LPRECT, LPARAM ioCount ) ; #else diff --git a/mozilla/gfx/src/windows/nsScreenWin.cpp b/mozilla/gfx/src/windows/nsScreenWin.cpp index 0b2e50df0cf..251122f8619 100644 --- a/mozilla/gfx/src/windows/nsScreenWin.cpp +++ b/mozilla/gfx/src/windows/nsScreenWin.cpp @@ -41,7 +41,7 @@ #if _MSC_VER >= 1200 -typedef BOOL (*GetMonitorInfoProc)(HMONITOR inMon, LPMONITORINFO ioInfo); +typedef BOOL (WINAPI *GetMonitorInfoProc)(HMONITOR inMon, LPMONITORINFO ioInfo); #endif