Qualify (some) calls to functions in the global namespace using an

explicit :: (it is unfortunate that there is no good way to detect all
of such calls in an automated manner). Also use new-style casts in parts
of the zlib code.

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/tm_unix/tm_unix.cpp b/modules/tm_unix/tm_unix.cpp
index cb9a8431f..51224a7d2 100644
--- a/modules/tm_unix/tm_unix.cpp
+++ b/modules/tm_unix/tm_unix.cpp
@@ -14,8 +14,8 @@ namespace Botan {
 *************************************************/
 u64bit Unix_Timer::clock() const
    {
-   struct timeval tv;
-   gettimeofday(&tv, 0);
+   struct ::timeval tv;
+   ::gettimeofday(&tv, 0);
    return combine_timers(tv.tv_sec, tv.tv_usec, 1000000);
    }