From afd1cad35efcc3ade4c755cd131431ba63f93885 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 6 May 2009 14:34:11 +0200 Subject: [PATCH] Compilation fixes for 3f5150b92c464213e2c2aa63c2a5b3b578d81ba3. --- src/common/command_line.cpp | 3 +++ src/common/locale.cpp | 9 ++++++--- src/common/os.cpp | 3 +++ src/common/translation.cpp | 3 ++- src/merge/mkvmerge.cpp | 2 +- src/merge/output_control.cpp | 2 +- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/common/command_line.cpp b/src/common/command_line.cpp index f696aa89a..bbe5cf453 100644 --- a/src/common/command_line.cpp +++ b/src/common/command_line.cpp @@ -16,6 +16,9 @@ #include #include #include +#ifdef SYS_WINDOWS +# include +#endif #include "common/command_line.h" #include "common/common.h" diff --git a/src/common/locale.cpp b/src/common/locale.cpp index 8afd17bfb..93529dab6 100644 --- a/src/common/locale.cpp +++ b/src/common/locale.cpp @@ -23,13 +23,16 @@ #include #include #include -#if SYS_WINDOWS +#ifdef SYS_WINDOWS # include #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 diff --git a/src/common/os.cpp b/src/common/os.cpp index 3577359b2..6f4273bce 100644 --- a/src/common/os.cpp +++ b/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; diff --git a/src/common/translation.cpp b/src/common/translation.cpp index efb5f1070..663d19d48 100644 --- a/src/common/translation.cpp +++ b/src/common/translation.cpp @@ -31,7 +31,8 @@ #if defined(SYS_WINDOWS) # include -# include "os_windows.h" +# include "common/os_windows.h" +# include "common/memory.h" #endif std::vector translation_c::ms_available_translations; diff --git a/src/merge/mkvmerge.cpp b/src/merge/mkvmerge.cpp index c914dede4..f87aa4f7a 100644 --- a/src/merge/mkvmerge.cpp +++ b/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; diff --git a/src/merge/output_control.cpp b/src/merge/output_control.cpp index 11bd76454..19b540ed4 100644 --- a/src/merge/output_control.cpp +++ b/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