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

Inline atoll and atof

parent 2b617e77
......@@ -70,24 +70,22 @@ static inline char *strndup (const char *str, size_t max)
# define strlcpy vlc_strlcpy
#endif
#ifndef HAVE_ATOF
# define atof vlc_atof
#endif
#ifndef HAVE_STRTOF
# ifdef HAVE_STRTOD
# define strtof( a, b ) ((float)strtod (a, b))
# endif
# define strtof( a, b ) ((float)strtod (a, b))
#endif
#ifndef HAVE_ATOLL
# define atoll vlc_atoll
#ifndef HAVE_ATOF
# define atof( str ) (strtod ((str), (char **)NULL, 10))
#endif
#ifndef HAVE_STRTOLL
# define strtoll vlc_strtoll
#endif
#ifndef HAVE_ATOLL
# define atoll( str ) (strtoll ((str), (char **)NULL, 10))
#endif
#ifndef HAVE_LLDIV
typedef struct {
long long quot; /* Quotient. */
......
......@@ -225,27 +225,6 @@ int vlc_asprintf( char **strp, const char *fmt, ... )
}
#endif
/*****************************************************************************
* atof: convert a string to a double.
*****************************************************************************/
#if !defined( HAVE_ATOF )
double vlc_atof( const char *nptr )
{
double f_result;
wchar_t *psz_tmp = NULL;
int i_len = strlen( nptr ) + 1;
psz_tmp = malloc( i_len * sizeof(wchar_t) );
if( !psz_tmp )
return NULL;
MultiByteToWideChar( CP_ACP, 0, nptr, -1, psz_tmp, i_len );
f_result = wcstod( psz_tmp, NULL );
free( psz_tmp );
return f_result;
}
#endif
/*****************************************************************************
* strtoll: convert a string to a 64 bits int.
*****************************************************************************/
......@@ -318,16 +297,6 @@ int64_t vlc_strtoll( const char *nptr, char **endptr, int base )
}
#endif
/*****************************************************************************
* atoll: convert a string to a 64 bits int.
*****************************************************************************/
#if !defined( HAVE_ATOLL )
int64_t vlc_atoll( const char *nptr )
{
return strtoll( nptr, (char **)NULL, 10 );
}
#endif
/**
* Copy a string to a sized buffer. The result is always nul-terminated
* (contrary to strncpy()).
......
......@@ -371,8 +371,6 @@ __var_TriggerCallback
__var_Type
vlc_alphasort
vlc_asprintf
vlc_atof
vlc_atoll
vlc_b64_decode
vlc_b64_decode_binary
vlc_b64_decode_binary_to_buffer
......
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