From 4285dee7783c0bbfbda79a59f07734b9d16d1aa1 Mon Sep 17 00:00:00 2001 From: Diederik de Groot Date: Thu, 7 Jan 2016 10:21:03 +0100 Subject: include/asterisk/time.h: Renamed global declaration:tv Renamed global declaration:tv to dummy_tv_var_for_types, which would oltherwise cause 'shadow' warnings when 'tv' was declared as a local variable elsewhere. Added comment to note that dummy_tv_var_for_types is never really exported and only used as a place holder. ASTERISK-25627 #close Change-Id: I9a6e17995006584f3627efe8988e3f8aa0f5dc28 --- include/asterisk/time.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'include/asterisk') diff --git a/include/asterisk/time.h b/include/asterisk/time.h index f2382df33..408325b6f 100644 --- a/include/asterisk/time.h +++ b/include/asterisk/time.h @@ -31,10 +31,12 @@ /* We have to let the compiler learn what types to use for the elements of a struct timeval since on linux, it's time_t and suseconds_t, but on *BSD, - they are just a long. */ -extern struct timeval tv; -typedef typeof(tv.tv_sec) ast_time_t; -typedef typeof(tv.tv_usec) ast_suseconds_t; + they are just a long. + note:dummy_tv_var_for_types never actually gets exported, only used as + local place holder. */ +extern struct timeval dummy_tv_var_for_types; +typedef typeof(dummy_tv_var_for_types.tv_sec) ast_time_t; +typedef typeof(dummy_tv_var_for_types.tv_usec) ast_suseconds_t; /*! * \brief Computes the difference (in seconds) between two \c struct \c timeval instances. -- cgit v1.2.3