Merge pull request MicrosoftDocs#3299 from MicrosoftDocs/FromPublicMasterBranch

Colin Robertson · web-flow · commit 7f0b2e67df8c · 2020-11-24T03:34:28.000-08:00
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master)
diff --git a/docs/atl-mfc-shared/codesnippet/CPP/afx-extension-module-structure_1.cpp b/docs/atl-mfc-shared/codesnippet/CPP/afx-extension-module-structure_1.cpp
@@ -1,4 +1,4 @@
-static AFX_EXTENSION_MODULE NVC_MFC_DLLDLL = { NULL, NULL };
+static AFX_EXTENSION_MODULE NVC_MFC_DLLDLL;
 extern "C" int APIENTRY
 DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
 {
@@ -11,4 +11,4 @@ DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
         
         // MFC extension DLL one-time initialization
         if (!AfxInitExtensionModule(NVC_MFC_DLLDLL, hInstance))
-            return 0;
+            return 0;
diff --git a/docs/build/run-time-library-behavior.md b/docs/build/run-time-library-behavior.md
@@ -116,7 +116,7 @@ The wizard provides the following code for MFC extension DLLs. In the code, `PRO
 #undef THIS_FILE
 static char THIS_FILE[] = __FILE__;
 #endif
-static AFX_EXTENSION_MODULE PROJNAMEDLL = { NULL, NULL };
+static AFX_EXTENSION_MODULE PROJNAMEDLL;
 
 extern "C" int APIENTRY
 DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
