Changeset: 1c457f0fd4e0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1c457f0fd4e0
Modified Files:
sql/storage/bat/bat_storage.c
tools/mserver/monet_version.c.in
Branch: default
Log Message:
Compilation fixes.
diffs (24 lines):
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -2929,7 +2929,7 @@ claim_segment(sql_trans *tr, sql_table *
if ((!inTransaction(tr, t) && !in_transaction && isGlobal(t)) ||
(!isNew(t) && isLocalTemp(t))) {
trans_add(tr, &t->base, s, &tc_gc_del, &commit_update_del,
isLocalTemp(t)?NULL:&log_update_del);
if (!isLocalTemp(t))
- tr->logchanges += cnt;
+ tr->logchanges += (int) cnt;
}
return slot;
}
diff --git a/tools/mserver/monet_version.c.in b/tools/mserver/monet_version.c.in
--- a/tools/mserver/monet_version.c.in
+++ b/tools/mserver/monet_version.c.in
@@ -79,7 +79,7 @@ monet_version(void)
#ifdef HAVE_LIBPCRE
print_libversion("libpcre",
pcre_version(),
- XSTRING(PCRE_MAJOR.PCRE_MINOR)
XSTRING(PCRE_PRERELEASE)
+ XSTRING(PCRE_MAJOR.PCRE_MINOR)
XSTRING("" PCRE_PRERELEASE)
" " XSTRING(PCRE_DATE));
#endif
#ifdef HAVE_OPENSSL
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
