Merge branch 'origin/fix/wrapper'

2014-06-01 14:40:55 -04:00 · 2014-06-01 14:40:55 -04:00 · e748088c06
parent e66cd56bf5 ba67b1ce12
commit e748088c06
2 changed files with 3 additions and 1 deletions
--- a/gtsam/3rdparty/CCOLAMD/Source/ccolamd.c
+++ b/gtsam/3rdparty/CCOLAMD/Source/ccolamd.c
@ -617,11 +617,11 @@

 #include "ccolamd.h"

-#include <stdlib.h>
 #include <math.h>
 #include <limits.h>

 #ifdef MATLAB_MEX_FILE
+typedef uint16_t char16_t;
 #include "mex.h"
 #include "matrix.h"
 #endif
--- a/gtsam/3rdparty/CCOLAMD/Source/ccolamd_global.c
+++ b/gtsam/3rdparty/CCOLAMD/Source/ccolamd_global.c
@ -13,6 +13,8 @@

 #ifndef NPRINT
 #ifdef MATLAB_MEX_FILE
+#include <stdlib.h>
+typedef uint16_t char16_t;
 #include "mex.h"
 int (*ccolamd_printf) (const char *, ...) = mexPrintf ;
 #else