From: Petar Jovanovic <mips32r2@gmail.com>
Date: Mon, 5 Dec 2016 16:54:06 +0000 (+0000)
Subject: Remove second definition of typedef ‘Time’
X-Git-Tag: svn/VALGRIND_3_13_0~247
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c8edf155af2f1d7478fd830abfbafeb67267e11;p=thirdparty%2Fvalgrind.git

Remove second definition of typedef ‘Time’

Remove redefinition of typedef ‘Time’ already defined in pub_tool_xtree.h

This fixes warning/error:

ms_main.c:633:14: warning: redefinition of typedef ‘Time’ [-Wpedantic]
 typedef Long Time;



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16174
---

diff --git a/massif/ms_main.c b/massif/ms_main.c
index 2010f784a0..cda4635265 100644
--- a/massif/ms_main.c
+++ b/massif/ms_main.c
@@ -627,11 +627,6 @@ static void sub_heap_xt(Xecu where, SizeT req_szB, Bool exclude_first_entry)
 // limit again, we again cull and then take them even more slowly, and so
 // on.
 
-// Time is measured either in i or ms or bytes, depending on the --time-unit
-// option.  It's a Long because it can exceed 32-bits reasonably easily, and
-// because we need to allow negative values to represent unset times.
-typedef Long Time;
-
 #define UNUSED_SNAPSHOT_TIME  -333  // A conspicuous negative number.
 
 typedef