Changeset: 095481856f17 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=095481856f17 Modified Files: NT/monetdb_config.h.in clients/Tests/exports.stable.out Branch: default Log Message:
Merge with Jan2014 branch. diffs (24 lines): diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in --- a/NT/monetdb_config.h.in +++ b/NT/monetdb_config.h.in @@ -108,7 +108,7 @@ /* Define if you have ctime_r(time_t*,char *buf,size_t s) */ #define HAVE_CTIME_R3 1 /* there is something very similar to ctime_r on Windows: */ -#define ctime_r(t,b,s) ctime_s(b,s,t) +#define ctime_r(t,b,s) (ctime_s(b,s,t) ? NULL : (b)) /* Define if you have the cURL library */ /* #undef HAVE_CURL */ diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -2865,7 +2865,7 @@ str prodRef; int profilerAvailable(void); void profilerEvent(int idx, MalBlkPtr mb, MalStkPtr stk, int pc, int start); void profilerGetCPUStat(lng *user, lng *nice, lng *sys, lng *idle, lng *iowait); -void profilerHeartbeatEvent(str msg); +void profilerHeartbeatEvent(str msg, lng ticks); str profilerRef; str projectRef; str projectdeltaRef; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
