Changeset: a3657bb5f055 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3657bb5f055
Modified Files:
gdk/gdk_private.h
testing/process.py
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (31 lines):
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -481,7 +481,6 @@ GDKreallocmax_debug(void *ptr, size_t si
return res;
}
#define GDKreallocmax(p, s, ps, e) GDKreallocmax_debug((p), (s), (ps),
(e), __FILE__, __LINE__)
-#define GDKmremap(p, m, oa, os, ns) GDKmremap_debug(p, m, os, os, ns,
__FILE__, __LINE__)
static inline void *
GDKmremap_debug(const char *path, int mode, void *old_address, size_t
old_size, size_t *new_size, const char *filename, int lineno)
{
@@ -497,6 +496,7 @@ GDKmremap_debug(const char *path, int mo
filename, lineno);
return res;
}
+#define GDKmremap(p, m, oa, os, ns) GDKmremap_debug(p, m, oa, os, ns,
__FILE__, __LINE__)
#endif
#endif
diff --git a/testing/process.py b/testing/process.py
--- a/testing/process.py
+++ b/testing/process.py
@@ -382,7 +382,7 @@ def server(args = [], stdin = None, stdo
s = args[i+1].partition('=')[0]
for j in range(len(cmd)):
if cmd[j] == '--set' and j+1 < len(cmd) and
cmd[j+1].startswith(s + '='):
- del cmd[i:i+2]
+ del cmd[j:j+2]
break
if log:
prompt = time.strftime('# %H:%M:%S > ')
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
