1- From 0c5a3ac37e7fc4f01cf8b41dbdffa13d235b490e Mon Sep 17 00:00:00 2001
1+ From c70ec8a687cc98b6cd179991c23c0577df7c5959 Mon Sep 17 00:00:00 2001
22From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
33Date: Mon, 27 Jan 2025 08:36:07 +0100
44Subject: [PATCH] crypto: fix preprocessor concatenation
@@ -7,9 +7,9 @@ String litteral don't need the '##' operator, which causes build
77failures:
88crypto/defaults.c:kepi:23: error: pasting ""SOFTWARE\\WOW6432Node\\OpenSSL"" and ""-"" does not give a valid preprocessing token
99---
10- crypto/cversion.c | 2 +-
11- crypto/defaults.c | 8 ++++----
12- 2 files changed, 5 insertions(+), 5 deletions(-)
10+ crypto/cversion.c | 2 +-
11+ crypto/defaults.c | 10 +++++- ----
12+ 2 files changed, 6 insertions(+), 6 deletions(-)
1313
1414diff --git a/crypto/cversion.c b/crypto/cversion.c
1515index 87154645b0..ae439c668b 100644
@@ -25,7 +25,7 @@ index 87154645b0..ae439c668b 100644
2525 #endif
2626
2727diff --git a/crypto/defaults.c b/crypto/defaults.c
28- index 908539cf31..d85f040214 100644
28+ index 908539cf31..6c993dbb31 100644
2929--- a/crypto/defaults.c
3030+++ b/crypto/defaults.c
3131@@ -19,7 +19,7 @@
@@ -48,7 +48,12 @@ index 908539cf31..d85f040214 100644
4848 ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
4949 TEXT(REGISTRY_KEY), KEY_WOW64_32KEY,
5050 KEY_QUERY_VALUE, &hkey);
51- @@ -97,7 +97,7 @@ static char *get_windows_regdirs(char *dst, LPCTSTR valuename)
51+ @@ -93,11 +93,11 @@ static char *get_windows_regdirs(char *dst, LPCTSTR valuename)
52+ goto out;
53+
54+ if (RegQueryValueEx(hkey, valuename,
55+ - NULL, &ktype, tempstr, &keysize) != ERROR_SUCCESS)
56+ + NULL, &ktype, (LPBYTE*)tempstr, &keysize) != ERROR_SUCCESS)
5257 goto out;
5358
5459 if (!WideCharToMultiByte(CP_UTF8, 0, tempstr, -1, dst, keysize,
0 commit comments