Compatibility with 64 bit systems.

5 files changed, 14 insertions, 3 deletions

diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index a28a7c973..8d3ad5437 100644
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -960,6 +960,12 @@ long Platform::SendScintilla(
 	return scintilla_send_message(SCINTILLA(w), msg, wParam, lParam);
 }
 
+long Platform::SendScintillaPointer(
+    WindowID w, unsigned int msg, unsigned long wParam, void *lParam) {
+	return scintilla_send_message(SCINTILLA(w), msg, wParam, 
+	    reinterpret_cast<sptr_t>(lParam));
+}
+
 bool Platform::IsDBCSLeadByte(int /*codePage*/, char /*ch*/) {
 	return false;
 }
diff --git a/include/Platform.h b/include/Platform.h
index 2d1e6e179..ffb4a3cc3 100644
--- a/include/Platform.h
+++ b/include/Platform.h
@@ -424,6 +424,8 @@ public:
 	static bool IsKeyDown(int key);
 	static long SendScintilla(
 		WindowID w, unsigned int msg, unsigned long wParam=0, long lParam=0);
+	static long SendScintillaPointer(
+		WindowID w, unsigned int msg, unsigned long wParam=0, void *lParam=0);
 	static bool IsDBCSLeadByte(int codePage, char ch);
 
 	// These are utility functions not really tied to a platform
diff --git a/include/Scintilla.h b/include/Scintilla.h
index 4a043b5ff..a15d3da92 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -21,7 +21,10 @@ int Scintilla_LinkLexers();
 // Here should be placed typedefs for uptr_t, an unsigned integer type large enough to
 // hold a pointer and sptr_t, a signed integer large enough to hold a pointer.
 // May need to be changed for 64 bit platforms.
-#ifdef __int3264
+#if _MSC_VER >= 1300
+#include <BaseTsd.h>
+#endif
+#ifdef MAXULONG_PTR
 typedef ULONG_PTR uptr_t;
 typedef LONG_PTR sptr_t;
 #else
diff --git a/src/CallTip.cxx b/src/CallTip.cxx
index 4b4ae0c7c..d67173b08 100644
--- a/src/CallTip.cxx
+++ b/src/CallTip.cxx
@@ -148,7 +148,7 @@ PRectangle CallTip::CallTipStart(int pos, Point pt, const char *defn,
 		look = newline + 1;
 		numLines++;
 	}
-	int lastWidth = surfaceMeasure->WidthText(font, look, strlen(look));
+	int lastWidth = surfaceMeasure->WidthText(font, look, static_cast<int>(strlen(look)));
 	width = Platform::Maximum(width, lastWidth) + 10;
 	int lineHeight = surfaceMeasure->Height(font);
 	// Extra line for border and an empty line at top and bottom
diff --git a/src/PropSet.cxx b/src/PropSet.cxx
index fe80c1210..296799691 100644
--- a/src/PropSet.cxx
+++ b/src/PropSet.cxx
@@ -228,7 +228,7 @@ static bool IsSuffixCaseInsensitive(const char *target, const char *suffix) {
 	size_t lensuffix = strlen(suffix);
 	if (lensuffix > lentarget)
 		return false;
-	for (int i = lensuffix - 1; i >= 0; i--) {
+	for (int i = static_cast<int>(lensuffix) - 1; i >= 0; i--) {
 		if (MakeUpperCase(target[i + lentarget - lensuffix]) !=
 		        MakeUpperCase(suffix[i]))
 			return false;