diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-01-09 11:15:32 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-01-09 11:15:32 -0600 |
| commit | 573b37c6581b54cfe80dfd9a956c29c33f11f4bd (patch) | |
| tree | d3bbaf7ec77332f0126df6965c46dc8f171f42e8 | |
| parent | 0f79c8839b08f4c8d0d7c0aca2e1a3573b148bca (diff) | |
| parent | 4285dee7783c0bbfbda79a59f07734b9d16d1aa1 (diff) | |
Merge "include/asterisk/time.h: Renamed global declaration:tv" into 13
| -rw-r--r-- | include/asterisk/time.h | 10 |
1 files changed, 6 insertions, 4 deletions
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. |