MonetDB: default - Merge with Nov2019

[Pedro Ferreira]

Changeset: 7b4210cbb88a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7b4210cbb88a
Modified Files:
        gdk/gdk_atoms.c
        monetdb5/mal/mal_factory.c
Branch: default
Log Message:

Merge with Nov2019


diffs (27 lines):

diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -933,7 +933,12 @@ ptrFromStr(const char *src, size_t *len,
        return (ssize_t) (p - src);
 }
 
+#ifdef _MSC_VER
+/* Windows doesn't put 0x in front whereas Linux does, so we do it ourselves */
+atomtostr(ptr, "0x%p", )
+#else
 atomtostr(ptr, "%p", )
+#endif
 
 #if SIZEOF_VOID_P == SIZEOF_INT
 atom_io(ptr, Int, int)
diff --git a/monetdb5/mal/mal_factory.c b/monetdb5/mal/mal_factory.c
--- a/monetdb5/mal/mal_factory.c
+++ b/monetdb5/mal/mal_factory.c
@@ -140,6 +140,7 @@ runFactory(Client cntxt, MalBlkPtr mb, M
                                lhs->len = 0;
                        }
                }
+               pl->stk->stktop = mb->vtop;
                pl->stk->stkbot= mb->vtop;      /* stack already initialized */
                msg = runMAL(cntxt, mb, 0, pl->stk);
         } else {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list