X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fptimer.c;h=c53b5e7215cd08c6d4ed62763e01bd9325d504eb;hb=85b98d08341ccd2abd2b0335465927e85eb20757;hp=bce8a3e5ffe5f1448510762e3829c8e2d2b3b56a;hpb=212396c7e1de6592294f92230254afdfd553843c;p=wget
diff --git a/src/ptimer.c b/src/ptimer.c
index bce8a3e5..c53b5e72 100644
--- a/src/ptimer.c
+++ b/src/ptimer.c
@@ -1,5 +1,6 @@
/* Portable timers.
- Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+ Foundation, Inc.
This file is part of GNU Wget.
@@ -16,15 +17,16 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Wget. If not, see .
-In addition, as a special exception, the Free Software Foundation
-gives permission to link the code of its release of Wget with the
-OpenSSL project's "OpenSSL" library (or with modified versions of it
-that use the same license as the "OpenSSL" library), and distribute
-the linked executables. You must obey the GNU General Public License
-in all respects for all of the code used other than "OpenSSL". If you
-modify this file, you may extend this exception to your version of the
-file, but you are not obligated to do so. If you do not wish to do
-so, delete this exception statement from your version. */
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work. */
/* This file implements "portable timers" (ptimers), objects that
measure elapsed time using the primitives most appropriate for the
@@ -55,13 +57,9 @@ so, delete this exception statement from your version. */
#include
#include
#include
-#ifdef HAVE_UNISTD_H
-# include
-#endif
+#include
#include
-#ifdef HAVE_SYS_TIME_H
-# include
-#endif
+#include
/* Cygwin currently (as of 2005-04-08, Cygwin 1.5.14) lacks clock_getres,
but still defines _POSIX_TIMERS! Because of that we simply use the
@@ -70,6 +68,7 @@ so, delete this exception statement from your version. */
# include
#endif
+#include "utils.h"
#include "ptimer.h"
/* Depending on the OS, one and only one of PTIMER_POSIX,
@@ -131,7 +130,7 @@ posix_init (void)
#endif
{ CLOCK_REALTIME, NO_SYSCONF_CHECK },
};
- int i;
+ size_t i;
/* Determine the clock we can use. For a clock to be usable, it
must be confirmed with sysconf (where applicable) and with
@@ -350,7 +349,7 @@ ptimer_reset (struct ptimer *pt)
}
/* Measure the elapsed time since timer creation/reset. This causes
- the timer to internally call clock_gettime (or gettimeofday, etc.)
+ the timer to internally call clock_gettime (or gettimeofday, etc.)
to update its idea of current time. The time is returned, but is
also stored for later access through ptimer_read().