Changeset 14534

Timestamp:

Jun 1, 2015, 6:52:14 PM (7 years ago)

Author:

mikedld

Message:

#5851: Don't use _configthreadlocale if not provided by CRT (even if declaration is present)

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/TrMacros.cmake (modified) (1 diff)
• configure.ac (modified) (1 diff)
• libtransmission/variant.c (modified) (3 diffs)

trunk/CMakeLists.txt

@@ -398 +398 @@
 
 set(NEEDED_FUNCTIONS
+    _configthreadlocale
     canonicalize_file_name
     daemon

trunk/cmake/TrMacros.cmake

@@ -66 +66 @@
     string(TOUPPER "${INPUT}" ID)
     string(REGEX REPLACE "[^A-Z0-9]+" "_" ID "${ID}")
-    string(REGEX REPLACE "^_+|_+$" "" ID "${ID}")
+    # string(REGEX REPLACE "^_+|_+$" "" ID "${ID}")
     set(${OVAR} "${ID}" PARENT_SCOPE)
 endfunction()

trunk/configure.ac

@@ -108 +108 @@
 
 AC_CHECK_HEADERS([stdbool.h xlocale.h])
-AC_CHECK_FUNCS([iconv_open pread pwrite lrintf strlcpy daemon dirname basename canonicalize_file_name strcasecmp localtime_r fallocate64 posix_fallocate memmem strsep strtold syslog valloc getpagesize posix_memalign statvfs htonll ntohll mkdtemp uselocale])
+AC_CHECK_FUNCS([iconv_open pread pwrite lrintf strlcpy daemon dirname basename canonicalize_file_name strcasecmp localtime_r fallocate64 posix_fallocate memmem strsep strtold syslog valloc getpagesize posix_memalign statvfs htonll ntohll mkdtemp uselocale _configthreadlocale])
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET

trunk/libtransmission/variant.c

@@ -54 +54 @@
   locale_t old_locale;
 #else
-#ifdef _WIN32
-  int old_thread_config;
+#if defined (HAVE__CONFIGTHREADLOCALE) && defined (_ENABLE_PER_THREAD_LOCALE)
+  int      old_thread_config;
 #endif
-  int category;
-  char old_locale[128];
+  int      category;
+  char     old_locale[128];
 #endif
 };
@@ -73 +73 @@
 #else
 
-#ifdef _WIN32
+#if defined (HAVE__CONFIGTHREADLOCALE) && defined (_ENABLE_PER_THREAD_LOCALE)
   context->old_thread_config = _configthreadlocale (_ENABLE_PER_THREAD_LOCALE);
 #endif
@@ -96 +96 @@
   setlocale (context->category, context->old_locale);
 
-#ifdef _WIN32
+#if defined (HAVE__CONFIGTHREADLOCALE) && defined (_ENABLE_PER_THREAD_LOCALE)
   _configthreadlocale (context->old_thread_config);
 #endif