Bug 827262 - Fix plugin hang UI compilation on mingw. r=bsmedberg

dom/plugins/ipc/PluginHangUIParent.cpp

@@ -176,7 +176,7 @@ PluginHangUIParent::Init(const nsString& aPluginName)
     return false;
   }
   nsAutoString procHandleStr;
-  procHandleStr.AppendPrintf("%p", procHandle);
+  procHandleStr.AppendPrintf("%p", procHandle.Get());
   commandLine.AppendLooseValue(procHandleStr.get());
 
   std::wstring ipcCookie;

dom/plugins/ipc/hangui/Makefile.in

@@ -17,7 +17,7 @@ CPPSRCS = \
 
 PROGRAM = plugin-hang-ui$(BIN_SUFFIX)
 
-OS_LIBS = comctl32.lib
+OS_LIBS = $(call EXPAND_LIBNAME,comctl32)
 
 RCINCLUDE = HangUIDlg.rc
 
@@ -33,6 +33,10 @@ STL_FLAGS = \
 
 MOZ_GLUE_LDFLAGS =
 
+ifdef GNU_CC
+WIN32_EXE_LDFLAGS = -municode
+endif
+
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 include $(topsrcdir)/config/rules.mk

dom/plugins/ipc/hangui/PluginHangUIChild.cpp

@@ -269,6 +269,9 @@ PluginHangUIChild::SetMainThread()
 } // namespace plugins
 } // namespace mozilla
 
+#ifdef __MINGW32__
+extern "C"
+#endif
 int
 wmain(int argc, wchar_t *argv[])
 {