From 24a4b0997c65ea052760657058b338c79046c5e2 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sun, 15 Apr 2018 22:31:17 -0400
Subject: [PATCH] fromScancode() -> uiprivFromScancode().

---
 common/areaevents.c    | 2 +-
 common/uipriv.h        | 2 +-
 unix/area.c            | 2 +-
 windows/areaevents.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/areaevents.c b/common/areaevents.c
index d913b763..491a7283 100644
--- a/common/areaevents.c
+++ b/common/areaevents.c
@@ -151,7 +151,7 @@ static const struct {
 	{ 0xFFFF, 0 },
 };
 
-int fromScancode(uintptr_t scancode, uiAreaKeyEvent *ke)
+int uiprivFromScancode(uintptr_t scancode, uiAreaKeyEvent *ke)
 {
 	int i;
 
diff --git a/common/uipriv.h b/common/uipriv.h
index 363450a8..8fc3d42e 100644
--- a/common/uipriv.h
+++ b/common/uipriv.h
@@ -51,7 +51,7 @@ struct uiprivClickCounter {
 };
 extern int uiprivClickCounterClick(uiprivClickCounter *c, int button, int x, int y, uintptr_t time, uintptr_t maxTime, int32_t xdist, int32_t ydist);
 extern void uiprivClickCounterReset(uiprivClickCounter *);
-extern int fromScancode(uintptr_t, uiAreaKeyEvent *);
+extern int uiprivFromScancode(uintptr_t, uiAreaKeyEvent *);
 
 // matrix.c
 extern void fallbackSkew(uiDrawMatrix *, double, double, double, double);
diff --git a/unix/area.c b/unix/area.c
index ca245bb0..cba1f5e7 100644
--- a/unix/area.c
+++ b/unix/area.c
@@ -411,7 +411,7 @@ static int areaKeyEvent(uiArea *a, int up, GdkEventKey *e)
 			goto keyFound;
 		}
 
-	if (fromScancode(e->hardware_keycode - 8, &ke))
+	if (uiprivFromScancode(e->hardware_keycode - 8, &ke))
 		goto keyFound;
 
 	// no supported key found; treat as unhandled
diff --git a/windows/areaevents.cpp b/windows/areaevents.cpp
index 4bf55665..c7014ecb 100644
--- a/windows/areaevents.cpp
+++ b/windows/areaevents.cpp
@@ -300,7 +300,7 @@ static int areaKeyEvent(uiArea *a, int up, WPARAM wParam, LPARAM lParam)
 		}
 
 	// and finally everything else
-	if (fromScancode((lParam >> 16) & 0xFF, &ke))
+	if (uiprivFromScancode((lParam >> 16) & 0xFF, &ke))
 		goto keyFound;
 
 	// not a supported key, assume unhandled