diff --git a/ftk/src/ftk.h b/ftk/src/ftk.h index 6a1d9c6..39a2d98 100644 --- a/ftk/src/ftk.h +++ b/ftk/src/ftk.h @@ -371,14 +371,11 @@ #define f_va_end(ap) ((void)0) #elif defined( FLM_SOLARIS) - void * f_va_arg_next( - f_va_list * pList); - #define f_va_start( list, name) \ ((void)((list) = (f_va_list)&__builtin_va_alist)) #define f_va_arg( list, type) \ - (*((type *)f_va_arg_next( &list))) + ((type *)__builtin_va_arg_incr((type *)(list)))[0] #define f_va_end( list) \ (void)(list) diff --git a/ftk/src/ftksem.cpp b/ftk/src/ftksem.cpp index bca3e70..31b97fa 100644 --- a/ftk/src/ftksem.cpp +++ b/ftk/src/ftksem.cpp @@ -304,6 +304,7 @@ FINLINE int sema_wait( } else { + f_assert( 0); goto Exit; } } diff --git a/ftk/src/ftkunix.cpp b/ftk/src/ftkunix.cpp index f51d297..d6c1cdc 100644 --- a/ftk/src/ftkunix.cpp +++ b/ftk/src/ftkunix.cpp @@ -1579,17 +1579,6 @@ FLMINT32 posix_atomic_xchg_32( return( i32RetVal); } -/********************************************************************** -Desc: -**********************************************************************/ -#if defined( FLM_SOLARIS) && !defined( FLM_GNUC) -void * f_va_arg_next( - f_va_list * pList) -{ - return( __builtin_va_arg_incr( *pList, NULL)); -} -#endif - #endif // FLM_UNIX #if defined( FLM_WATCOM_NLM)