From 6f40e7050db08d35270f87dc43b880b3ca0c49af Mon Sep 17 00:00:00 2001
From: Martin Nilsson <nilsson@opera.com>
Date: Mon, 18 Aug 2014 19:45:20 +0200
Subject: [PATCH] Now works with dmalloc again.
---
src/main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main.c b/src/main.c
index 2424d7a4dd..e3be28e643 100644
--- a/src/main.c
+++ b/src/main.c
@@ -98,6 +98,7 @@ static void set_master(const char *file)
{
if( master_file_location != _master_location+CONSTANT_STRLEN(MASTER_COOKIE))
free(master_file_location);
+#undef strdup /* We can't use dmalloc strdup before pike_memory is initialized. */
master_file_location = strdup( file );
}
--
GitLab