64-bit mingw port: In hash table routines, use 'intptr_t' instead of 'long'.

[cln.git] / src / base / cl_malloc.cc

diff --git a/src/base/cl_malloc.cc b/src/base/cl_malloc.cc
index 8765cf1078062089e9f6ae4e91a00224d71bd80c..639217d6f35f004f1167a857b34444a64d96c68a 100644 (file)
--- a/src/base/cl_malloc.cc
+++ b/src/base/cl_malloc.cc
@@ -1,7 +1,7 @@
 // malloc_hook, free_hook.
 
 // General includes.
-#include "cl_sysdep.h"
+#include "base/cl_sysdep.h"
 
 // Specification.
 #include "cln/malloc.h"
@@ -9,9 +9,9 @@
 
 // Implementation.
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "cln/io.h"
-#include "cln/abort.h"
+#include "cln/exception.h"
 
 #ifndef malloc
   extern "C" void* malloc (size_t size);
@@ -28,8 +28,7 @@ static void* xmalloc (size_t size)
        void* ptr = malloc(size);
        if (ptr)
                return ptr;
-       fprint(stderr, "Out of virtual memory.\n");
-       cl_abort();
+       throw runtime_exception("Out of virtual memory.");
 }
 
 void* (*malloc_hook) (size_t size) = xmalloc;