diff --git a/mex/sources/ms-sbvar/modify_for_mex.cc b/mex/sources/ms-sbvar/modify_for_mex.cc
index 8d9cc5a46..0b0b525a4 100644
--- a/mex/sources/ms-sbvar/modify_for_mex.cc
+++ b/mex/sources/ms-sbvar/modify_for_mex.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Dynare Team
+ * Copyright (C) 2010-2011 Dynare Team
*
* This file is part of Dynare.
*
@@ -17,51 +17,23 @@
* along with Dynare. If not, see .
*/
+#if defined(MATLAB_MEX_FILE) || defined(OCTAVE_MEX_FILE)
#ifdef __cplusplus
extern "C"
{
#endif
-#include
-#include
-#include
-#include
-#include
-
-
-#if defined(MATLAB_MEX_FILE) || defined(OCTAVE_MEX_FILE)
#include
-#endif
int constant_seed;
- void
- ms_fprintf_err(char *str, ...)
- {
- va_list ap;
- va_start(ap, str);
-
-#if defined(MATLAB_MEX_FILE) || defined(OCTAVE_MEX_FILE)
- mexPrintf(str, ap);
-#else
- vfprintf(stderr, str, ap);
-#endif
-
- va_end(ap);
- }
-
-
-
void
msExit(int status)
{
-#if defined(MATLAB_MEX_FILE) || defined(OCTAVE_MEX_FILE)
throw "Error in MS-SBVAR MEX file.\n";
-#else
- exit(status);
-#endif
}
#ifdef __cplusplus
}
#endif
+#endif
diff --git a/mex/sources/ms-sbvar/modify_for_mex.h b/mex/sources/ms-sbvar/modify_for_mex.h
index 671ca5476..7bb195708 100644
--- a/mex/sources/ms-sbvar/modify_for_mex.h
+++ b/mex/sources/ms-sbvar/modify_for_mex.h
@@ -20,42 +20,26 @@
#ifndef _MEXMOD
#define _MEXMOD
-void ms_exit(int status);
-void ms_fprintf_err(const char * str, ...);
-extern int constant_seed;
-
-#endif
-
-
#if defined(MATLAB_MEX_FILE) || defined(OCTAVE_MEX_FILE)
#include
#include
#include
-#include
-#define msMalloc mxMalloc
-#define msCalloc mxCalloc
-#define msRealloc mxRealloc
-#define msFree mxFree
+#define dw_malloc(n) mxMalloc(n)
+#define dw_calloc(n) mxCalloc(n)
+#define dw_realloc(buffer,n) mxRealloc(buffer,n)
+#define dw_free(buffer) mxFree(buffer)
+#define dw_exit(n) msExit(n)
+void msExit(int status);
+extern int constant_seed;
+
+/* Write Matlab Output */
mxArray *globalMatlabStruct;
-
-#ifndef _MEXWRITE
-#define _MEXWRITE
-
void mex_write_to_matlab_matfile(double *, int, int, const char *, const char *);
void mex_write_to_matlab_global_struct(double *, int, int, const char *);
mxArray *getMxArray(double *, int, int);
#endif
-
-#else
-
-#define ms_fprintf_stdout printf
-#define msMalloc malloc
-#define msCalloc calloc
-#define msRealloc realloc
-#define msFree free
-
#endif