Fix a naming conflict in msquic.h (microsoft#4060)

* fix it * remove submodule update
jtesbei · Jan 18, 2024 · 0ffbb9b · 0ffbb9b
1 parent e36d0fa
commit 0ffbb9b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/bin/winkernel/nmrprovider.c b/src/bin/winkernel/nmrprovider.c
@@ -29,8 +29,8 @@ MSQUIC_NMR_PROVIDER NmrProvider;
 const MSQUIC_NMR_DISPATCH MsQuicNmrDispatch = {
     .Version = 0,
     .Reserved = 0,
-    .MsQuicOpenVersion = MsQuicOpenVersion,
-    .MsQuicClose = MsQuicClose,
+    .OpenVersion = MsQuicOpenVersion,
+    .Close = MsQuicClose,
 };
 
 NTSTATUS

diff --git a/src/inc/msquic.h b/src/inc/msquic.h
@@ -1680,8 +1680,8 @@ DECLSPEC_SELECTANY GUID MSQUIC_MODULE_ID = {
 typedef struct MSQUIC_NMR_DISPATCH {
     uint16_t  Version;
     uint16_t  Reserved;
-    MsQuicOpenVersionFn MsQuicOpenVersion;
-    MsQuicCloseFn MsQuicClose;
+    MsQuicOpenVersionFn OpenVersion;
+    MsQuicCloseFn Close;
 } MSQUIC_NMR_DISPATCH;
 
 //

diff --git a/src/test/bin/winkernel/control.cpp b/src/test/bin/winkernel/control.cpp
@@ -103,8 +103,8 @@ QuicTestCtlInitialize(
 
     MsQuic =
         new (std::nothrow) MsQuicApi(
-            QUIC_GET_DISPATCH(NmrClient)->MsQuicOpenVersion,
-            QUIC_GET_DISPATCH(NmrClient)->MsQuicClose);
+            QUIC_GET_DISPATCH(NmrClient)->OpenVersion,
+            QUIC_GET_DISPATCH(NmrClient)->Close);
     if (!MsQuic) {
         goto Error;
     }