Compilation fixes for 3f5150b92c.

src/common/command_line.cpp

@@ -16,6 +16,9 @@
 #include <cstring>
 #include <string>
 #include <vector>
+#ifdef SYS_WINDOWS
+# include <windows.h>
+#endif
 
 #include "common/command_line.h"
 #include "common/common.h"

src/common/locale.cpp

@@ -23,13 +23,16 @@
 #include <locale.h>
 #include <string>
 #include <vector>
-#if SYS_WINDOWS
+#ifdef SYS_WINDOWS
 # include <windows.h>
 #endif
 
 #include "common/common.h"
 #include "common/locale.h"
 #include "common/memory.h"
+#ifdef SYS_WINDOWS
+# include "common/string_formatting.h"
+#endif
 
 struct kax_conv_t {
   iconv_t ict_from_utf8, ict_to_utf8;
@@ -65,7 +68,7 @@ get_local_charset() {
 
   setlocale(LC_CTYPE, "");
 #if defined(COMP_MINGW) || defined(COMP_MSC)
-  lc_charset = "CP" + to_std::string(GetACP());
+  lc_charset = "CP" + to_string(GetACP());
 #elif defined(SYS_SOLARIS)
   int i;
 
@@ -84,7 +87,7 @@ get_local_charset() {
 std::string
 get_local_console_charset() {
 #if defined(SYS_WINDOWS)
-  return std::string("CP") + to_std::string(GetOEMCP());
+  return std::string("CP") + to_string(GetOEMCP());
 #else
   return get_local_charset();
 #endif

src/common/os.cpp

@@ -23,6 +23,9 @@
 #include "common/common.h"
 #include "common/locale.h"
 #include "common/mm_io.h"
+#ifdef SYS_WINDOWS
+# include "common/string_editing.h"
+#endif
 
 using namespace std;
 

src/common/translation.cpp

@@ -31,7 +31,8 @@
 
 #if defined(SYS_WINDOWS)
 # include <windows.h>
-# include "os_windows.h"
+# include "common/os_windows.h"
+# include "common/memory.h"
 #endif
 
 std::vector<translation_c> translation_c::ms_available_translations;

src/merge/mkvmerge.cpp

@@ -64,7 +64,7 @@
 #include "merge/output_control.h"
 
 #ifdef SYS_WINDOWS
-# include "os_windows.h"
+# include "common/os_windows.h"
 #endif
 
 using namespace libmatroska;

src/merge/output_control.cpp

@@ -15,7 +15,7 @@
 
 #include "common/os.h"
 #ifdef SYS_WINDOWS
-# include "os_windows.h"
+# include "common/os_windows.h"
 #endif
 
 #include <errno.h>