https://git.reactos.org/?p=reactos.git;a=commitdiff;h=378642eb4f4ea1122e41b…
commit 378642eb4f4ea1122e41bf61bd7323f0fb9d5ccb
Author: Jérôme Gardou <jerome.gardou(a)reactos.org>
AuthorDate: Mon Nov 9 09:15:57 2020 +0100
Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com>
CommitDate: Mon Nov 16 16:58:10 2020 +0100
[NDIS] Use FORCEINLINE instead of __inline
---
drivers/network/ndis/ndis/buffer.c | 8 +++++---
drivers/network/ndis/ndis/misc.c | 10 +++++-----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/network/ndis/ndis/buffer.c b/drivers/network/ndis/ndis/buffer.c
index 4c00fa96d6f..f03f52ae94d 100644
--- a/drivers/network/ndis/ndis/buffer.c
+++ b/drivers/network/ndis/ndis/buffer.c
@@ -10,7 +10,9 @@
#include <ndissys.h>
-__inline ULONG SkipToOffset(
+FORCEINLINE
+ULONG
+SkipToOffset(
IN PNDIS_BUFFER Buffer,
IN UINT Offset,
IN OUT PUCHAR *Data,
@@ -481,7 +483,7 @@ NdisAllocatePacketPoolEx(
NumberOfDescriptors = 0xffff;
}
- Length = sizeof(NDIS_PACKET) + sizeof(NDIS_PACKET_OOB_DATA) +
+ Length = sizeof(NDIS_PACKET) + sizeof(NDIS_PACKET_OOB_DATA) +
sizeof(NDIS_PACKET_EXTENSION) + ProtocolReservedLength;
Size = sizeof(NDISI_PACKET_POOL) + Length * NumberOfDescriptors;
@@ -1163,7 +1165,7 @@ EXPORT
NdisPacketSize(
IN UINT ProtocolReservedSize)
{
- return sizeof(NDIS_PACKET) + sizeof(NDIS_PACKET_OOB_DATA) +
+ return sizeof(NDIS_PACKET) + sizeof(NDIS_PACKET_OOB_DATA) +
sizeof(NDIS_PACKET_EXTENSION) + ProtocolReservedSize;
}
diff --git a/drivers/network/ndis/ndis/misc.c b/drivers/network/ndis/ndis/misc.c
index 19755c5ed87..71e64c12cde 100644
--- a/drivers/network/ndis/ndis/misc.c
+++ b/drivers/network/ndis/ndis/misc.c
@@ -125,14 +125,14 @@ typedef struct _NDIS_HANDLE_OBJECT
PVOID MapBuffer;
} NDIS_HANDLE_OBJECT, *PNDIS_HANDLE_OBJECT;
-__inline
+FORCEINLINE
PNDIS_HANDLE_OBJECT
NDIS_HANDLE_TO_POBJECT ( NDIS_HANDLE handle )
{
return (PNDIS_HANDLE_OBJECT)handle;
}
-__inline
+FORCEINLINE
NDIS_HANDLE
NDIS_POBJECT_TO_HANDLE ( PNDIS_HANDLE_OBJECT obj )
{
@@ -289,7 +289,7 @@ NdisOpenFile(
FILE_SYNCHRONOUS_IO_NONALERT, // ULONG CreateOptions
0, // PVOID EaBuffer
0 ); // ULONG EaLength
-
+
if ( !NT_SUCCESS(*Status) )
{
NDIS_DbgPrint(MIN_TRACE, ("ZwCreateFile failed (%x) Name %wZ\n", *Status,
FileName));
@@ -346,7 +346,7 @@ NdisGetCurrentProcessorCounts(
{
NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
- ExGetCurrentProcessorCounts( (PULONG) pIdleCount, (PULONG) pKernelAndUser, (PULONG)
pIndex);
+ ExGetCurrentProcessorCounts( (PULONG) pIdleCount, (PULONG) pKernelAndUser, (PULONG)
pIndex);
}
@@ -356,7 +356,7 @@ NdisGetCurrentProcessorCounts(
VOID
EXPORT
NdisGetSystemUpTime(OUT PULONG pSystemUpTime)
-{
+{
ULONG Increment;
LARGE_INTEGER TickCount;