From 47c497c464ad82369443875b0343ed5071a9ade0 Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Wed, 11 Jan 2006 21:28:09 +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 --- widget/src/windows/nsScreenManagerWin.cpp | 4 ++-- widget/src/windows/nsScreenWin.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/widget/src/windows/nsScreenManagerWin.cpp b/widget/src/windows/nsScreenManagerWin.cpp index 4f3a466767ef..155596a71e6d 100644 --- a/widget/src/windows/nsScreenManagerWin.cpp +++ b/widget/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/widget/src/windows/nsScreenWin.cpp b/widget/src/windows/nsScreenWin.cpp index 0b2e50df0cf3..251122f8619e 100644 --- a/widget/src/windows/nsScreenWin.cpp +++ b/widget/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