Rebase against 97b420224e767b24d89722ff5efeca38a8ecf1e2.

This commit is contained in:
Zebediah Figura
2021-04-01 23:03:15 -05:00
parent 4e2dc89043
commit 545073aafa
4 changed files with 25 additions and 25 deletions

View File

@@ -1,4 +1,4 @@
From 5d866aebeeb7760eed0f35a206d43ef32bafbffe Mon Sep 17 00:00:00 2001
From e1c9210a92b5b3fda4767f3a9ba12eff5427314f Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 5 Aug 2017 03:38:38 +0200
Subject: [PATCH] ntdll: Add inline versions of RtlEnterCriticalSection /
@@ -9,7 +9,7 @@ Subject: [PATCH] ntdll: Add inline versions of RtlEnterCriticalSection /
1 file changed, 34 insertions(+)
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index b8f9dc28e63..444feb5d152 100644
index e50d48dc3cc..13a9123eb06 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -26,6 +26,7 @@
@@ -20,7 +20,7 @@ index b8f9dc28e63..444feb5d152 100644
#include "wine/asm.h"
#define DECLARE_CRITICAL_SECTION(cs) \
@@ -88,6 +89,39 @@ extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN;
@@ -85,6 +86,39 @@ extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN;
extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, __ms_va_list args ) DECLSPEC_HIDDEN;
extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, __ms_va_list args ) DECLSPEC_HIDDEN;
@@ -59,7 +59,7 @@ index b8f9dc28e63..444feb5d152 100644
+
/* load order */
#ifndef _WIN64
#ifdef _WIN64
--
2.30.1
2.30.2