Merge branch 'master' of https://github.com/lukacu/trax

votchallenge · Jul 31, 2015 · 4191275 · 4191275
2 parents ffd80b8 + c5b423b
commit 4191275
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/message.c b/lib/message.c
@@ -43,7 +43,7 @@ static void initialize_sockets(void) {
     return;
 }
 
-#define __INLINE __inline
+#define __INLINE 
 
 #else
 

diff --git a/matlab/traxserver.cpp b/matlab/traxserver.cpp
@@ -20,9 +20,8 @@
 
 #define MEX_CREATE_EMTPY mxCreateDoubleMatrix(0, 0, mxREAL)
 
-//#define MEX_ERROR(M) mexErrMsgTxt(M)
-
-#define MEX_ERROR(M) { mexPrintf("ERROR: "); mexPrintf(M); mexPrintf("\n\n"); }
+#define MEX_ERROR(M) mexErrMsgTxt(M)
+//#define MEX_ERROR(M) { mexPrintf("ERROR: "); mexPrintf(M); mexPrintf("\n\n"); }
 
 using namespace std;