diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-06 13:35:21 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-06 13:35:21 -0500 |
| commit | 0f870234febd9dba0df78e903b412ea19d681062 (patch) | |
| tree | 05f5d59ee7ddb4e991c50fbe9a6b8ef3484d92fc /Source/CursesDialog | |
| parent | 78c4418fa0a08b63a944ac66821e8bd95fdd73e0 (diff) | |
| parent | cd408d93fdf347ff63a8062f75f1f4ee3e898b17 (diff) | |
| download | cmake-0f870234febd9dba0df78e903b412ea19d681062.tar.gz | |
Merge branch 'backport-no-global-setlocale' into no-global-setlocale
Resolve conflict in Source/CMakeLists.txt by taking both changes.
Diffstat (limited to 'Source/CursesDialog')
| -rw-r--r-- | Source/CursesDialog/ccmake.cxx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx index 28f3d9b787..3d92a2dfd6 100644 --- a/Source/CursesDialog/ccmake.cxx +++ b/Source/CursesDialog/ccmake.cxx @@ -16,7 +16,6 @@ #include <signal.h> #include <sys/ioctl.h> -#include <locale.h> #include "cmCursesMainForm.h" #include "cmCursesStandardIncludes.h" @@ -95,8 +94,6 @@ void CMakeMessageHandler(const char* message, const char* title, bool&, int main(int argc, char const* const* argv) { - setlocale(LC_CTYPE, ""); - cmsys::Encoding::CommandLineArguments encoding_args = cmsys::Encoding::CommandLineArguments::Main(argc, argv); argc = encoding_args.argc(); |