From fbee8d3f4f90b5bc591e823ed33bc38d8f59424d Mon Sep 17 00:00:00 2001
From: Daniel Waggoner <dwaggoner@frbatlanta.org>
Date: Tue, 22 Feb 2011 15:08:00 -0500
Subject: [PATCH] fixed dw_free compile issue in dw_elliptical.c and dw_std.h
(cherry picked from commit 38c403021ab2e23cfe4a90e138ff347ab6d3c8ef)
---
elliptical/dw_elliptical.c | 6 +-----
include/dw_std.h | 10 +++++-----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/elliptical/dw_elliptical.c b/elliptical/dw_elliptical.c
index 6bb9a04..6299847 100644
--- a/elliptical/dw_elliptical.c
+++ b/elliptical/dw_elliptical.c
@@ -402,11 +402,7 @@ TElliptical* CreateElliptical_TruncatedPower(int dim, TVector center, TMatrix sc
elliptical->cummulative_radius=cummulative_radius_truncated_power;
elliptical->draw_vector=draw_truncated_power;
elliptical->print_info=print_info_truncated_power;
-#if defined(MATLAB_MEX_FILE) || defined(OCTAVE_MEX_FILE)
- elliptical->free=(void (*)(void*))mxFree;
-#else
- elliptical->free=(void (*)(void*))free;
-#endif
+ elliptical->free=(void (*)(void*))dw_free;
}
return elliptical;
diff --git a/include/dw_std.h b/include/dw_std.h
index 2ea9172..96b1bf2 100644
--- a/include/dw_std.h
+++ b/include/dw_std.h
@@ -26,12 +26,12 @@
#include <stdlib.h>
-#define dw_malloc(n) malloc(n)
-#define dw_calloc(n) calloc(n)
-#define dw_realloc(buffer,n) realloc(buffer,n)
-#define dw_free(buffer) free(buffer)
+#define dw_malloc malloc
+#define dw_calloc calloc
+#define dw_realloc realloc
+#define dw_free free
-#define dw_exit(n) exit(n)
+#define dw_exit exit
#endif
--
GitLab