[PATCH v5 0/2] MR7369: include/security.h: Add definition of NEGOSSP_NAME
`error: use of undeclared identifier 'NEGOSSP_NAME'` I encountered the following problem when trying to compile these programs with winegcc: - https://learn.microsoft.com/en-us/windows/win32/secauthn/using-sspi-with-a-w... - https://learn.microsoft.com/en-us/windows/win32/secauthn/using-sspi-with-a-w... So, adding this code helps to solve the problem -- v5: include/security.h: Correct comment style to /* */ https://gitlab.winehq.org/wine/wine/-/merge_requests/7369
From: Vadim Kazakov <xipster(a)etersoft.ru> --- include/security.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/security.h b/include/security.h index 11ff6f77044..0df6357384b 100644 --- a/include/security.h +++ b/include/security.h @@ -17,6 +17,17 @@ #ifndef _SECURITY_H #define _SECURITY_H +#ifndef NEGOSSP_NAME +#define NEGOSSP_NAME_W L"Negotiate" +#define NEGOSSP_NAME_A "Negotiate" + +#ifdef UNICODE +#define NEGOSSP_NAME NEGOSSP_NAME_W +#else +#define NEGOSSP_NAME NEGOSSP_NAME_A +#endif +#endif // NEGOSSP_NAME + #include <sspi.h> #if defined(SECURITY_WIN32) || defined(SECURITY_KERNEL) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7369
From: Vadim Kazakov <xipster(a)etersoft.ru> --- include/security.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/security.h b/include/security.h index 0df6357384b..09f17684c96 100644 --- a/include/security.h +++ b/include/security.h @@ -26,7 +26,7 @@ #else #define NEGOSSP_NAME NEGOSSP_NAME_A #endif -#endif // NEGOSSP_NAME +#endif /* NEGOSSP_NAME */ #include <sspi.h> -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7369
On Wed Feb 19 14:13:42 2025 +0000, Nikolay Sivov wrote:
Looks like gitlab fails to apply due to utf-8 in committer name. It's probably the easiest to change that to English, and also please change single line comment style to /**/ . I've corrected all the problems. Everything should be OK.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/7369#note_95186
Looks like gitlab fails to apply due to utf-8 in committer name.
Huh, really? It's dealt with non-ASCII characters before... -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7369#note_95220
You'll want to edit the commit itself rather than creating an extra fixup commit. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7369#note_95221
On Wed Feb 19 18:44:27 2025 +0000, Elizabeth Figura wrote:
Looks like gitlab fails to apply due to utf-8 in committer name. Huh, really? It's dealt with non-ASCII characters before... I'm not sure, but failure error said "Committer identity unknown". But "git am" is able to consume original patch text just fine, showing correct name in the logs.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/7369#note_95229
On Wed Feb 19 14:13:42 2025 +0000, Vadim Kazakov wrote:
I've corrected all the problems. Everything should be OK. Now please squash them together. Simply squash locally and force-push again.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/7369#note_95231
participants (4)
-
Elizabeth Figura (＠zfigura) -
Nikolay Sivov (＠nsivov)
-
Vadim Kazakov
-
Vadim Kazakov (＠xipster)