projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
autoupdates
[pspp]
/
lib
/
gettime.c
diff --git
a/lib/gettime.c
b/lib/gettime.c
index 7b5a75aaf69185d48d56c8abd631c0ac155f16d0..044b26f0f30e7171603097489c098a1b5226a150 100644
(file)
--- a/
lib/gettime.c
+++ b/
lib/gettime.c
@@
-1,10
+1,11
@@
/* gettime -- get the system clock
/* gettime -- get the system clock
- Copyright (C) 2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 2002, 2004-2007, 2009-2010 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-12,35
+13,36
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Written by Paul Eggert. */
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "timespec.h"
#include "timespec.h"
-/* Get the system time. */
+#include <sys/time.h>
-int
+/* Get the system time into *TS. */
+
+void
gettime (struct timespec *ts)
{
gettime (struct timespec *ts)
{
-#if defined CLOCK_REALTIME && HAVE_CLOCK_SETTIME
+#if HAVE_NANOTIME
+ nanotime (ts);
+#else
+
+# if defined CLOCK_REALTIME && HAVE_CLOCK_GETTIME
if (clock_gettime (CLOCK_REALTIME, ts) == 0)
if (clock_gettime (CLOCK_REALTIME, ts) == 0)
- return
0
;
-#endif
+ return;
+#
endif
{
struct timeval tv;
{
struct timeval tv;
- int r = gettimeofday (&tv, 0);
- if (r == 0)
- {
- ts->tv_sec = tv.tv_sec;
- ts->tv_nsec = tv.tv_usec * 1000;
- }
- return r;
+ gettimeofday (&tv, NULL);
+ ts->tv_sec = tv.tv_sec;
+ ts->tv_nsec = tv.tv_usec * 1000;
}
}
+
+#endif
}
}