KangLin
diff --git a/‎src/global-init.cxx
Copy file name to clipboardExpand all lines: src/global-init.cxx
+2Lines changed: 2 additions & 0 deletions b/‎src/global-init.cxx
Copy file name to clipboardExpand all lines: src/global-init.cxx
+2Lines changed: 2 additions & 0 deletions
@@ -692,11 +692,13 @@ thread_callback (LPVOID /*hinstDLL*/, DWORD fdwReason, LPVOID /*lpReserved*/)
     {
     case DLL_PROCESS_ATTACH:
     {
+#if ! defined (LOG4CPLUS_REQUIRE_EXPLICIT_INITIALIZATION)
         // We cannot initialize log4cplus directly here. This is because
         // DllMain() is called under loader lock. When we are using C++11
         // threads and synchronization primitives then there is a deadlock
         // somewhere in internals of std::mutex::lock().
         queueLog4cplusInitializationThroughAPC ();
+#endif
         break;
     }
Original file line number	Diff line number	Diff line change
`@@ -692,11 +692,13 @@ thread_callback (LPVOID /hinstDLL/, DWORD fdwReason, LPVOID /lpReserved/)`
`692`	`692`	`{`
`693`	`693`	`case DLL_PROCESS_ATTACH:`
`694`	`694`	`{`
	`695`	`+#if ! defined (LOG4CPLUS_REQUIRE_EXPLICIT_INITIALIZATION)`
`695`	`696`	`// We cannot initialize log4cplus directly here. This is because`
`696`	`697`	`// DllMain() is called under loader lock. When we are using C++11`
`697`	`698`	`// threads and synchronization primitives then there is a deadlock`
`698`	`699`	`// somewhere in internals of std::mutex::lock().`
`699`	`700`	`queueLog4cplusInitializationThroughAPC ();`
	`701`	`+#endif`
`700`	`702`	`break;`
`701`	`703`	`}`
`702`	`704`