Rebase against a55a37d1dae2231d8dec9f3191449f89be0b10dc.

This commit is contained in:
Alistair Leslie-Hughes
2021-02-17 09:56:43 +11:00
parent 4046ffe6c9
commit d0873d2c72
6 changed files with 50 additions and 50 deletions

View File

@@ -1,4 +1,4 @@
From fea92ad5c12ddb8d0a4d2363f21afe9c199359d1 Mon Sep 17 00:00:00 2001
From b9815e86e026c431050253146177f5c624a28756 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 92fcde95a8a..51a9069e290 100644
index 67696f80db3..f25d8adc217 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -26,6 +26,7 @@
@@ -17,10 +17,10 @@ index 92fcde95a8a..51a9069e290 100644
#include "winternl.h"
#include "unixlib.h"
+#include "wine/debug.h"
#include "wine/server.h"
#include "wine/asm.h"
@@ -103,6 +104,39 @@ extern int ntdll_wcstoumbs( const WCHAR* src, DWORD srclen, char* dst, DWORD dst
#define DECLARE_CRITICAL_SECTION(cs) \
@@ -96,6 +97,39 @@ extern int ntdll_wcstoumbs( const WCHAR* src, DWORD srclen, char* dst, DWORD dst
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;
@@ -61,5 +61,5 @@ index 92fcde95a8a..51a9069e290 100644
enum loadorder
--
2.27.0
2.30.0