Commit f0755417 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Fix (From|To)Locale (closes #546)

parent cb347302
......@@ -382,7 +382,7 @@ CPPFLAGS_save="${CPPFLAGS_save} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcd
dnl Check for system libs needed
need_libc=false
AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch lstat assert)
AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch lstat)
dnl Check for usual libc functions
AC_CHECK_FUNCS(strdup strndup atof)
......
......@@ -27,11 +27,7 @@
#include <vlc/vlc.h>
#include "charset.h"
#ifdef HAVE_ASSERT
# include <assert.h>
#else
# define assert( c ) ((void)0)
#endif
#include <assert.h>
#include <stdio.h>
#include <errno.h>
......@@ -183,6 +179,7 @@ char *FromLocale( const char *locale )
vlc_iconv( from_locale.hd, NULL, NULL, NULL, NULL );
}
vlc_mutex_unlock( &from_locale.lock );
*optr = '\0';
assert (inb == 0);
assert (*iptr == '\0');
......@@ -249,6 +246,7 @@ char *ToLocale( const char *utf8 )
vlc_iconv( to_locale.hd, NULL, NULL, NULL, NULL );
}
vlc_mutex_unlock( &to_locale.lock );
*optr = '\0';
assert (inb == 0);
assert (*iptr == '\0');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment