Merge pull request #10396 from electron/cleanup

Cleanup obsolete code
2017-08-30 19:05:05 +09:00 · 2017-08-30 19:05:05 +09:00 · c2ab4f711f
commit c2ab4f711f
parent 1630f14b99 64d9e5b861
4 changed files with 4 additions and 27 deletions
--- a/atom/app/atom_main.cc
+++ b/atom/app/atom_main.cc
@ -9,6 +9,7 @@
 #if defined(OS_WIN)
 #include <windows.h>  // windows.h must be included first

+#include <atlbase.h>  // ensures that ATL statics like `_AtlWinModule` are initialized (it's an issue in static debug build)
 #include <shellapi.h>
 #include <shellscalingapi.h>
 #include <tchar.h>