Changeset: 3b897dad1e4d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3b897dad1e4d Modified Files: gdk/gdk_tracer.h monetdb5/modules/mal/wlc.c Branch: gdk_tracer Log Message:
merged diffs (21 lines): diff --git a/gdk/gdk_tracer.h b/gdk/gdk_tracer.h --- a/gdk/gdk_tracer.h +++ b/gdk/gdk_tracer.h @@ -382,4 +382,4 @@ gdk_export gdk_return GDKtracer_flush_bu gdk_export gdk_return GDKtracer_show_info(void); -#endif +#endif /* _GDK_TRACER_H_ */ diff --git a/monetdb5/modules/mal/wlc.c b/monetdb5/modules/mal/wlc.c --- a/monetdb5/modules/mal/wlc.c +++ b/monetdb5/modules/mal/wlc.c @@ -532,7 +532,7 @@ WLCsettime(Client cntxt, InstrPtr pci, I #ifdef HAVE_LOCALTIME_R (void) gmtime_r(&clk, &ctm); #else - ctm = gmtime(&clk); + ctm = *gmtime(&clk); #endif strftime(wlc_time, sizeof(wlc_time), "%Y-%m-%d %H:%M:%S.000",&ctm); if (pushStr(cntxt->wlc, p, wlc_time) == NULL) _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list