Merge branch 'master' into dev

2019-06-24 00:21:07 -07:00
parent 443fa0fbb5 f0731862d6
commit faadceadf5
2 changed files with 2 additions and 1 deletions
--- a/src/init.c
+++ b/src/init.c
@@ -385,7 +385,7 @@ static void mi_process_done(void) {

 #if defined(_WIN32) && defined(MI_SHARED_LIB)
  // Windows DLL: easy to hook into process_init and thread_done
-  #include <Windows.h>
+  #include <windows.h>

  __declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) {
    if (reason==DLL_PROCESS_ATTACH) {