From ca79b65eea2653ecbf62eb0f1d0caf4ff6dea601 Mon Sep 17 00:00:00 2001
From: mitchell <unknown>
Date: Sun, 5 Jan 2020 17:10:23 -0500
Subject: Synchronizing LongTerm3 with default. Ideally this covers anything
 missed during the backport process.

---
 gtk/DepGen.py   | 4 ++--
 gtk/PlatGTK.cxx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'gtk')

diff --git a/gtk/DepGen.py b/gtk/DepGen.py
index 20f4a0148..4feea8a9c 100644
--- a/gtk/DepGen.py
+++ b/gtk/DepGen.py
@@ -6,9 +6,9 @@
 
 import sys
 
-sys.path.append("../")
+sys.path.append("..")
 
-import scripts.Dependencies as Dependencies
+from scripts import Dependencies
 
 topComment = "# Created by DepGen.py. To recreate, run 'python DepGen.py'.\n"
 
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index 94f6c449f..66a2daac2 100755
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -645,7 +645,7 @@ std::string UTF8FromLatin1(const char *s, int len) {
 	std::string utfForm(len*2 + 1, '\0');
 	size_t lenU = 0;
 	for (int i=0; i<len; i++) {
-		unsigned int uch = static_cast<unsigned char>(s[i]);
+		const unsigned char uch = static_cast<unsigned char>(s[i]);
 		if (uch < 0x80) {
 			utfForm[lenU++] = uch;
 		} else {
-- 
cgit v1.2.3