diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-01-09 11:15:22 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-01-09 11:15:23 -0600 |
| commit | e6f77da6642f399b0db8cb4a8faa42d37260cce6 (patch) | |
| tree | fb02e6b244fa53b9141a14b9af0f3058187528ad | |
| parent | a146bde1f728b2bc5901ccb1292c1cb330196a58 (diff) | |
| parent | 6745cd65299f997f02cc1e676a6df529100482eb (diff) | |
Merge "include/asterisk/time.h: Renamed global declaration:tv"
| -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 529490630..f49d68951 100644 --- a/include/asterisk/time.h +++ b/include/asterisk/time.h @@ -37,10 +37,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. |