Auto merge of #5052 - daira:windows-ntdll-regression, r=daira

Link with ntdll library on Windows

This fixes a regression for builds targeting Windows introduced in #4947. It also includes a minor cleanup to fix a build warning.
closes #5051

configure.ac

@@ -393,6 +393,7 @@ case $host in
      AC_CHECK_LIB([shlwapi],    [main],, AC_MSG_ERROR(lib missing))
      AC_CHECK_LIB([iphlpapi],   [main],, AC_MSG_ERROR(lib missing))
      AC_CHECK_LIB([crypt32],    [main],, AC_MSG_ERROR(lib missing))
+     AC_CHECK_LIB([ntdll],      [main],, AC_MSG_ERROR(lib missing))
 
      # -static is interpreted by libtool, where it has a different meaning.
      # In libtool-speak, it's -all-static.

src/metrics.cpp

@@ -22,6 +22,7 @@
 #include <string>
 #ifdef WIN32
 #include <io.h>
+#include <wincon.h>
 #else
 #include <sys/ioctl.h>
 #endif
@@ -566,8 +567,6 @@ int printInitMessage()
 }
 
 #ifdef WIN32
-#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
-
 bool enableVTMode()
 {
     // Set output mode to handle virtual terminal sequences