diff options
| author | Peter Åstrand <astrand@cendio.se> | 2008-12-09 11:20:39 +0000 |
|---|---|---|
| committer | Peter Åstrand <astrand@cendio.se> | 2008-12-09 11:20:39 +0000 |
| commit | 8ebd542124a6172336b8955f7f969dd99a06c515 (patch) | |
| tree | 601976cb8d4bc9825b92ecefb7bdf2da66e08c62 /win | |
| parent | 1cd3ddaa54f0e750fe1b00ccdc228894510a48c7 (diff) | |
| download | tigervnc-8ebd542124a6172336b8955f7f969dd99a06c515.tar.gz tigervnc-8ebd542124a6172336b8955f7f969dd99a06c515.zip | |
MinGW tweak: Like last patch, use __rfbmax/__rfbmin.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3338 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'win')
| -rw-r--r-- | win/rfb_win32/SDisplayCorePolling.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/win/rfb_win32/SDisplayCorePolling.cxx b/win/rfb_win32/SDisplayCorePolling.cxx index fc57ecd0..510ffb1f 100644 --- a/win/rfb_win32/SDisplayCorePolling.cxx +++ b/win/rfb_win32/SDisplayCorePolling.cxx @@ -20,6 +20,7 @@ #include <rfb_win32/SDisplayCorePolling.h> #include <rfb/LogWriter.h> +#include <rfb/util.h> using namespace rfb; using namespace rfb::win32; @@ -33,7 +34,7 @@ const int SDisplayCorePolling::pollTimerId = 1; SDisplayCorePolling::SDisplayCorePolling(SDisplay* d, UpdateTracker* ut, int pollInterval_) : MsgWindow(_T("rfb::win32::SDisplayCorePolling")), updateTracker(ut), pollTimer(getHandle(), pollTimerId), pollNextStrip(false), display(d) { - pollInterval = max(10, (pollInterval_ / POLLING_SEGMENTS)); + pollInterval = __rfbmax(10, (pollInterval_ / POLLING_SEGMENTS)); copyrect.setUpdateTracker(ut); } @@ -74,7 +75,7 @@ void SDisplayCorePolling::flushUpdates() { // No. Poll the next section pollrect.tl.y = pollNextY; pollNextY += pollIncrementY; - pollrect.br.y = min(pollNextY, pollrect.br.y); + pollrect.br.y = __rfbmin(pollNextY, pollrect.br.y); updateTracker->add_changed(pollrect); } } |