From: Peter Åstrand <astrand@cendio.se>
Date: Tue, 9 Dec 2008 13:39:24 +0000 (+0000)
Subject: MinGW tweak: calculateScaleBoundary is not an inline method. If it
X-Git-Tag: v0.0.90~325
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b49cd1baaa6423c8d1c6d72edd4d083baa8624c7;p=tigervnc.git

MinGW tweak: calculateScaleBoundary is not an inline method. If it
was, it should have been defined in the header file. See
http://www.parashift.com/c++-faq-lite/inline-functions.html.

Also, protect header file with normal #ifdef.



git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3343 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/common/rfb/ScaledPixelBuffer.h b/common/rfb/ScaledPixelBuffer.h
index ffd68b64..4c377521 100644
--- a/common/rfb/ScaledPixelBuffer.h
+++ b/common/rfb/ScaledPixelBuffer.h
@@ -22,6 +22,9 @@
 // from the source buffer to destination buffer using bilinear 
 // interpolation.
 
+#ifndef __RFB_SCALEDPIXELBUFFER_H__
+#define __RFB_SCALEDPIXELBUFFER_H__
+
 #include <rdr/types.h>
 #include <rdr/Exception.h>
 #include <rfb/Rect.h>
@@ -87,7 +90,7 @@ namespace rfb {
 
     // Calculate the scaled image rectangle which depend on the source 
     // image rectangle.
-    inline Rect calculateScaleBoundary(const Rect& r);
+    Rect calculateScaleBoundary(const Rect& r);
 
   protected:
 
@@ -122,3 +125,5 @@ namespace rfb {
   };
 
 };
+
+#endif