From 9bbb5c03d3ebb0f927e60baa9f2ab57d784780ef Mon Sep 17 00:00:00 2001
From: Neil <devnull@localhost>
Date: Tue, 9 Feb 2016 10:19:11 +1100
Subject: Fix 64-bit build on Windows which was broken in 3.6.3 as long only
 32-bits.

---
 doc/ScintillaHistory.html      | 3 +++
 gtk/ScintillaGTK.cxx           | 2 +-
 include/ScintillaWidget.h      | 2 +-
 test/gi/Scintilla-0.1.gir.good | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 5f43bfe2d..5071541a1 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -519,6 +519,9 @@
 	extends nested comments to unlimited levels.
 	</li>
 	<li>
+	For GTK+ on Windows fix 64-bit build which was broken in 3.6.3.
+	</li>
+	<li>
 	For Qt, release builds have assertions turned off.
 	</li>
 	<li>
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 25bb2a947..dc5f08257 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -3051,7 +3051,7 @@ sptr_t scintilla_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_
 	return psci->WndProc(iMessage, wParam, lParam);
 }
 
-sptr_t scintilla_object_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
+gintptr scintilla_object_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 	return scintilla_send_message(sci, iMessage, wParam, lParam);
 }
 
diff --git a/include/ScintillaWidget.h b/include/ScintillaWidget.h
index 2c3d12dbe..f4ae18208 100644
--- a/include/ScintillaWidget.h
+++ b/include/ScintillaWidget.h
@@ -44,7 +44,7 @@ struct _ScintillaClass {
 
 GType		scintilla_object_get_type		(void);
 GtkWidget*	scintilla_object_new			(void);
-long		scintilla_object_send_message	(ScintillaObject *sci, unsigned int iMessage, guintptr wParam, gintptr lParam);
+gintptr		scintilla_object_send_message	(ScintillaObject *sci, unsigned int iMessage, guintptr wParam, gintptr lParam);
 
 #ifndef G_IR_SCANNING
 /* The legacy names confuse the g-ir-scanner program */
diff --git a/test/gi/Scintilla-0.1.gir.good b/test/gi/Scintilla-0.1.gir.good
index 6c9595121..b3919a725 100644
--- a/test/gi/Scintilla-0.1.gir.good
+++ b/test/gi/Scintilla-0.1.gir.good
@@ -53,7 +53,7 @@ and/or use gtk-doc annotations.  -->
       </virtual-method>
       <method name="send_message" c:identifier="scintilla_object_send_message">
         <return-value transfer-ownership="none">
-          <type name="glong" c:type="long"/>
+          <type name="gintptr" c:type="gintptr"/>
         </return-value>
         <parameters>
           <instance-parameter name="sci" transfer-ownership="none">
-- 
cgit v1.2.3