From fdc720a5a23e10a6b7ff4f51362db9ed5181aa8d Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Wed, 25 Apr 2018 17:12:55 +1000
Subject: Backport: Use set of coercion functions for transforming WndProc
 parameters into pointers.

Backport of changeset 6738:5b39367ee7da.
---
 cocoa/ScintillaCocoa.mm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cocoa')

diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index b24e29a49..a26cf074a 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -855,11 +855,11 @@ sptr_t ScintillaCocoa::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lPar
         return reinterpret_cast<sptr_t>(this);
 
       case SCI_TARGETASUTF8:
-        return TargetAsUTF8(reinterpret_cast<char*>(lParam));
+        return TargetAsUTF8(CharPtrFromSPtr(lParam));
 
       case SCI_ENCODEDFROMUTF8:
-        return EncodedFromUTF8(reinterpret_cast<char*>(wParam),
-                               reinterpret_cast<char*>(lParam));
+        return EncodedFromUTF8(ConstCharPtrFromUPtr(wParam),
+					       CharPtrFromSPtr(lParam));
 
       case SCI_SETIMEINTERACTION:
         // Only inline IME supported on Cocoa
-- 
cgit v1.2.3