From 560ecbe9bb78e492b13619f0be9a7a0f6fc1a111 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 2 Dec 2009 19:44:01 +0000 Subject: [PATCH] (trunk libT) fix implicit pointer conversion error when #included in C++ --- libtransmission/utils.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libtransmission/utils.h b/libtransmission/utils.h index 1588b6af6..c39ecb195 100644 --- a/libtransmission/utils.h +++ b/libtransmission/utils.h @@ -436,10 +436,12 @@ struct tm * tr_localtime_r( const time_t *_clock, struct tm *_result ); int tr_moveFile( const char * oldpath, const char * newpath, tr_bool * renamed ) TR_GNUC_NONNULL(1,2); -static TR_INLINE void tr_removeElementFromArray( void * array, int index_to_remove, - size_t sizeof_element, size_t nmemb ) +static TR_INLINE void tr_removeElementFromArray( void * array, + int index_to_remove, + size_t sizeof_element, + size_t nmemb ) { - char * a = array; + char * a = (char*) array; memmove( a + sizeof_element * index_to_remove, a + sizeof_element * ( index_to_remove + 1 ), -- 2.40.0