From: Diederik de Groot <ddegroot@talon.nl>
Date: Thu, 7 Jan 2016 09:21:03 +0000 (+0100)
Subject: include/asterisk/time.h: Renamed global declaration:tv
X-Git-Tag: 11.22.0-rc1~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7188c72a071ded1e05a0c646b4da2bba147be1b8;p=thirdparty%2Fasterisk.git

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
---

diff --git a/include/asterisk/time.h b/include/asterisk/time.h
index dd68db7044..f67f488d07 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.