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

Fix win32 linking

parent 1231f33d
...@@ -722,7 +722,7 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw ) ...@@ -722,7 +722,7 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw )
VLC_EXPORT( int, vlc_vasprintf, (char **, const char *, va_list ) ); VLC_EXPORT( int, vlc_vasprintf, (char **, const char *, va_list ) );
VLC_EXPORT( int, vlc_asprintf, (char **, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) ); VLC_EXPORT( int, vlc_asprintf, (char **, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) );
VLC_EXPORT( size_t, vlc_strlcpy, ( char *, const char *, size_t ) ); VLC_EXPORT( size_t, vlc_strlcpy, ( char *, const char *, size_t ) );
VLC_EXPORT( int64_t, vlc_strtoll, ( const char *nptr, char **endptr, int base ) ); VLC_EXPORT( long long, vlc_strtoll, ( const char *nptr, char **endptr, int base ) );
VLC_EXPORT( char *, vlc_strcasestr, ( const char *s1, const char *s2 ) ); VLC_EXPORT( char *, vlc_strcasestr, ( const char *s1, const char *s2 ) );
......
...@@ -167,10 +167,12 @@ int vlc_asprintf( char **strp, const char *fmt, ... ) ...@@ -167,10 +167,12 @@ int vlc_asprintf( char **strp, const char *fmt, ... )
/***************************************************************************** /*****************************************************************************
* strtoll: convert a string to a 64 bits int. * strtoll: convert a string to a 64 bits int.
*****************************************************************************/ *****************************************************************************/
#if !defined( HAVE_STRTOLL ) long long vlc_strtoll( const char *nptr, char **endptr, int base )
int64_t vlc_strtoll( const char *nptr, char **endptr, int base )
{ {
int64_t i_value = 0; #if defined( HAVE_STRTOLL )
return strtoll( nptr, endptr, base );
#else
long long i_value = 0;
int sign = 1, newbase = base ? base : 10; int sign = 1, newbase = base ? base : 10;
while( isspace(*nptr) ) nptr++; while( isspace(*nptr) ) nptr++;
...@@ -233,8 +235,8 @@ int64_t vlc_strtoll( const char *nptr, char **endptr, int base ) ...@@ -233,8 +235,8 @@ int64_t vlc_strtoll( const char *nptr, char **endptr, int base )
} }
return i_value * sign; return i_value * sign;
}
#endif #endif
}
/** /**
* Copy a string to a sized buffer. The result is always nul-terminated * Copy a string to a sized buffer. The result is always nul-terminated
......
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