diff -up octave-3.8.2/libinterp/dldfcn/amd.cc.suitesparse octave-3.8.2/libinterp/dldfcn/amd.cc --- octave-3.8.2/libinterp/dldfcn/amd.cc.suitesparse 2014-08-06 11:57:55.000000000 -0600 +++ octave-3.8.2/libinterp/dldfcn/amd.cc 2014-09-16 15:14:12.538123673 -0600 @@ -24,7 +24,7 @@ along with Octave; see the file COPYING. // in the help of the functions. #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include @@ -164,11 +164,11 @@ The author of the code itself is Timothy // FIXME: how can we manage the memory allocation of amd // in a cleaner manner? - amd_malloc = malloc; - amd_free = free; - amd_calloc = calloc; - amd_realloc = realloc; - amd_printf = printf; + suitesparse_assign_function(malloc_func, amd_malloc, malloc); + suitesparse_assign_function(free_func, amd_free, free); + suitesparse_assign_function(calloc_func, amd_calloc, calloc); + suitesparse_assign_function(realloc_func, amd_realloc, realloc); + suitesparse_assign_function(printf_func, amd_printf, printf); octave_idx_type result = AMD_NAME (_order) (n_col, cidx, ridx, P, Control, Info); diff -up octave-3.8.2/libinterp/dldfcn/symbfact.cc.suitesparse octave-3.8.2/libinterp/dldfcn/symbfact.cc --- octave-3.8.2/libinterp/dldfcn/symbfact.cc.suitesparse 2014-08-06 11:54:15.000000000 -0600 +++ octave-3.8.2/libinterp/dldfcn/symbfact.cc 2014-09-16 15:22:41.924557046 -0600 @@ -22,7 +22,7 @@ along with Octave; see the file COPYING. */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "SparseCmplxCHOL.h" @@ -114,17 +114,15 @@ factorization as determined by @var{typ} if (spu == 0.) { cm->print = -1; - cm->print_function = 0; + suitesparse_assign_function(printf_func, cm->print_function, 0); } else { cm->print = static_cast (spu) + 2; - cm->print_function =&SparseCholPrint; + suitesparse_assign_function(printf_func, cm->print_function, &SparseCholPrint); } cm->error_handler = &SparseCholError; - cm->complex_divide = CHOLMOD_NAME(divcomplex); - cm->hypotenuse = CHOLMOD_NAME(hypot); double dummy; cholmod_sparse Astore; diff -up octave-3.8.2/liboctave/array/CSparse.cc.suitesparse octave-3.8.2/liboctave/array/CSparse.cc --- octave-3.8.2/liboctave/array/CSparse.cc.suitesparse 2014-08-06 11:57:55.000000000 -0600 +++ octave-3.8.2/liboctave/array/CSparse.cc 2014-09-16 15:22:16.310677157 -0600 @@ -23,7 +23,7 @@ along with Octave; see the file COPYING. */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include @@ -5664,17 +5664,15 @@ SparseComplexMatrix::fsolve (MatrixType if (spu == 0.) { cm->print = -1; - cm->print_function = 0; + suitesparse_assign_function(printf_func, cm->print_function, 0); } else { cm->print = static_cast (spu) + 2; - cm->print_function =&SparseCholPrint; + suitesparse_assign_function(printf_func, cm->print_function, &SparseCholPrint); } cm->error_handler = &SparseCholError; - cm->complex_divide = CHOLMOD_NAME(divcomplex); - cm->hypotenuse = CHOLMOD_NAME(hypot); cm->final_ll = true; @@ -5907,17 +5905,15 @@ SparseComplexMatrix::fsolve (MatrixType if (spu == 0.) { cm->print = -1; - cm->print_function = 0; + suitesparse_assign_function(printf_func, cm->print_function, 0); } else { cm->print = static_cast (spu) + 2; - cm->print_function =&SparseCholPrint; + suitesparse_assign_function(printf_func, cm->print_function, &SparseCholPrint); } cm->error_handler = &SparseCholError; - cm->complex_divide = CHOLMOD_NAME(divcomplex); - cm->hypotenuse = CHOLMOD_NAME(hypot); cm->final_ll = true; @@ -6198,17 +6194,15 @@ SparseComplexMatrix::fsolve (MatrixType if (spu == 0.) { cm->print = -1; - cm->print_function = 0; + suitesparse_assign_function(printf_func, cm->print_function, 0); } else { cm->print = static_cast (spu) + 2; - cm->print_function =&SparseCholPrint; + suitesparse_assign_function(printf_func, cm->print_function, &SparseCholPrint); } cm->error_handler = &SparseCholError; - cm->complex_divide = CHOLMOD_NAME(divcomplex); - cm->hypotenuse = CHOLMOD_NAME(hypot); cm->final_ll = true; @@ -6420,17 +6414,15 @@ SparseComplexMatrix::fsolve (MatrixType if (spu == 0.) { cm->print = -1; - cm->print_function = 0; + suitesparse_assign_function(printf_func, cm->print_function, 0); } else { cm->print = static_cast (spu) + 2; - cm->print_function =&SparseCholPrint; + suitesparse_assign_function(printf_func, cm->print_function, &SparseCholPrint); } cm->error_handler = &SparseCholError; - cm->complex_divide = CHOLMOD_NAME(divcomplex); - cm->hypotenuse = CHOLMOD_NAME(hypot); cm->final_ll = true; diff -up octave-3.8.2/liboctave/array/dSparse.cc.suitesparse octave-3.8.2/liboctave/array/dSparse.cc --- octave-3.8.2/liboctave/array/dSparse.cc.suitesparse 2014-08-06 11:57:55.000000000 -0600 +++ octave-3.8.2/liboctave/array/dSparse.cc 2014-09-16 15:22:01.253747787 -0600 @@ -23,7 +23,7 @@ along with Octave; see the file COPYING. */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include @@ -5866,17 +5866,15 @@ SparseMatrix::fsolve (MatrixType &mattyp if (spu == 0.) { cm->print = -1; - cm->print_function = 0; + suitesparse_assign_function(printf_func, cm->print_function, 0); } else { cm->print = static_cast (spu) + 2; - cm->print_function =&SparseCholPrint; + suitesparse_assign_function(printf_func, cm->print_function, &SparseCholPrint); } cm->error_handler = &SparseCholError; - cm->complex_divide = CHOLMOD_NAME(divcomplex); - cm->hypotenuse = CHOLMOD_NAME(hypot); cm->final_ll = true; @@ -6083,17 +6081,15 @@ SparseMatrix::fsolve (MatrixType &mattyp if (spu == 0.) { cm->print = -1; - cm->print_function = 0; + suitesparse_assign_function(printf_func, cm->print_function, 0); } else { cm->print = static_cast (spu) + 2; - cm->print_function =&SparseCholPrint; + suitesparse_assign_function(printf_func, cm->print_function, &SparseCholPrint); } cm->error_handler = &SparseCholError; - cm->complex_divide = CHOLMOD_NAME(divcomplex); - cm->hypotenuse = CHOLMOD_NAME(hypot); cm->final_ll = true; @@ -6345,17 +6341,15 @@ SparseMatrix::fsolve (MatrixType &mattyp if (spu == 0.) { cm->print = -1; - cm->print_function = 0; + suitesparse_assign_function(printf_func, cm->print_function, 0); } else { cm->print = static_cast (spu) + 2; - cm->print_function =&SparseCholPrint; + suitesparse_assign_function(printf_func, cm->print_function, &SparseCholPrint); } cm->error_handler = &SparseCholError; - cm->complex_divide = CHOLMOD_NAME(divcomplex); - cm->hypotenuse = CHOLMOD_NAME(hypot); cm->final_ll = true; @@ -6579,17 +6573,15 @@ SparseMatrix::fsolve (MatrixType &mattyp if (spu == 0.) { cm->print = -1; - cm->print_function = 0; + suitesparse_assign_function(printf_func, cm->print_function, 0); } else { cm->print = static_cast (spu) + 2; - cm->print_function =&SparseCholPrint; + suitesparse_assign_function(printf_func, cm->print_function, &SparseCholPrint); } cm->error_handler = &SparseCholError; - cm->complex_divide = CHOLMOD_NAME(divcomplex); - cm->hypotenuse = CHOLMOD_NAME(hypot); cm->final_ll = true; diff -up octave-3.8.2/liboctave/numeric/sparse-base-chol.cc.suitesparse octave-3.8.2/liboctave/numeric/sparse-base-chol.cc --- octave-3.8.2/liboctave/numeric/sparse-base-chol.cc.suitesparse 2014-08-06 11:54:14.000000000 -0600 +++ octave-3.8.2/liboctave/numeric/sparse-base-chol.cc 2014-09-16 15:23:24.252358549 -0600 @@ -22,7 +22,7 @@ along with Octave; see the file COPYING. */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "sparse-base-chol.h" @@ -105,17 +105,15 @@ sparse_base_cholprint = -1; - cm->print_function = 0; + suitesparse_assign_function(printf_func, cm->print_function, 0); } else { cm->print = static_cast (spu) + 2; - cm->print_function =&SparseCholPrint; + suitesparse_assign_function(printf_func, cm->print_function, &SparseCholPrint); } cm->error_handler = &SparseCholError; - cm->complex_divide = CHOLMOD_NAME(divcomplex); - cm->hypotenuse = CHOLMOD_NAME(hypot); cm->final_asis = false; cm->final_super = false; diff -up octave-3.8.2/liboctave/util/oct-sparse.h.suitesparse octave-3.8.2/liboctave/util/oct-sparse.h --- octave-3.8.2/liboctave/util/oct-sparse.h.suitesparse 2014-08-06 11:54:15.000000000 -0600 +++ octave-3.8.2/liboctave/util/oct-sparse.h 2014-09-16 15:14:13.417119567 -0600 @@ -94,4 +94,12 @@ along with Octave; see the file COPYING. #endif #endif +// Cope with new suitesparse versions +// +#if defined( SUITESPARSE_VERSION ) && SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE(4,3) +#define suitesparse_assign_function(f_name,f_var,f_assign) (SuiteSparse_config.f_name = f_assign) +#else +#define suitesparse_assign_function(f_name,f_var,f_assign) (f_var = f_assign) +#endif + #endif