From ec8e914c8155eced1ea7a2c643aef257395c4a72 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 28 May 2019 19:58:27 +0300 Subject: [PATCH] Fix handling of -xrm on MS-Windows broken by recent commits * src/w32reg.c (w32_get_string_resource): The argument V_RDB is a 'char **', not a 'char *'. This fixes -xrm handling on MS-Windows, broken by conversion of x_get_string_resource to terminal-specific hook. (cherry picked from commit 833097cbc4856001ae77b33365faf09c1b3c30e3) --- src/w32reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/w32reg.c b/src/w32reg.c index 844e5613770..99b3973d708 100644 --- a/src/w32reg.c +++ b/src/w32reg.c @@ -143,7 +143,7 @@ w32_get_string_resource_1 (const char *name, const char *class, DWORD dwexptype) const char * w32_get_string_resource (void *v_rdb, const char *name, const char *class) { - const char *rdb = v_rdb; + const char *rdb = *(char **) v_rdb; if (rdb) { -- 2.39.2