Merge branch 'master' of https://github.com/z3prover/z3

src/api/ml/z3.ml

@@ -2023,3 +2023,7 @@ let toggle_warning_messages = Z3native.toggle_warning_messages
 let enable_trace = Z3native.enable_trace
 
 let disable_trace = Z3native.enable_trace
+
+module Memory = struct
+  let reset = Z3native.reset_memory
+end

src/api/ml/z3.mli

@@ -3472,3 +3472,11 @@ val enable_trace : string -> unit
    Remarks: It is a NOOP otherwise.
 *)
 val disable_trace : string -> unit
+
+
+(** Memory management **)
+module Memory :
+sig
+  (** Reset all allocated resourced **)
+  val reset : unit -> unit
+end

src/api/z3_macros.h

@@ -19,7 +19,3 @@ Copyright (c) 2015 Microsoft Corporation
 #ifndef DEFINE_TYPE
 #define DEFINE_TYPE(T) typedef struct _ ## T *T
 #endif
-
-#ifndef DEFINE_VOID
-#define DEFINE_VOID(T) typedef void* T
-#endif