Changeset: b8edfb5b49fb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b8edfb5b49fb
Modified Files:
gdk/gdk_utils.c
Branch: default
Log Message:
Get your merging right, please.
diffs (16 lines):
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1360,11 +1360,7 @@ GDKusec(void)
return (lng) (f.QuadPart / 10);
#elif defined(HAVE_CLOCK_GETTIME)
struct timespec ts;
-#undef CLOCK_REALTIME_COARSE
-#ifdef CLOCK_REALTIME_COARSE
- if (clock_gettime(CLOCK_REALTIME_COARSE, &ts) < 0)
-#endif
- (void) clock_gettime(CLOCK_REALTIME, &ts);
+ (void) clock_gettime(CLOCK_REALTIME, &ts);
return (lng) (ts.tv_sec * LL_CONSTANT(1000000) + ts.tv_nsec / 1000);
#elif defined(HAVE_GETTIMEOFDAY)
struct timeval tv;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
