From 2398aa3761e638d6453a8e7aeef04edb53877708 Mon Sep 17 00:00:00 2001 From: maier Date: Tue, 26 Feb 2013 17:05:02 +0000 Subject: [PATCH] Bugfix: Get it right with extern "C" git-svn-id: https://svn.dealii.org/branches/branch_cmake@28582 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/bundled/umfpack/UMFPACK/Source/cholmod_blas.h | 4 ++++ deal.II/source/lac/sparse_direct.cc | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deal.II/bundled/umfpack/UMFPACK/Source/cholmod_blas.h b/deal.II/bundled/umfpack/UMFPACK/Source/cholmod_blas.h index 709f2d0132..303769054c 100644 --- a/deal.II/bundled/umfpack/UMFPACK/Source/cholmod_blas.h +++ b/deal.II/bundled/umfpack/UMFPACK/Source/cholmod_blas.h @@ -16,6 +16,8 @@ #ifndef CHOLMOD_BLAS_H #define CHOLMOD_BLAS_H +extern "C" { + /* ========================================================================== */ /* === Architecture ========================================================= */ /* ========================================================================== */ @@ -448,4 +450,6 @@ void BLAS_ZGERU (BLAS_INT *m, BLAS_INT *n, double *alpha, } \ } +} /*extern "C"*/ + #endif diff --git a/deal.II/source/lac/sparse_direct.cc b/deal.II/source/lac/sparse_direct.cc index 9e24e31b8a..7043349a5e 100644 --- a/deal.II/source/lac/sparse_direct.cc +++ b/deal.II/source/lac/sparse_direct.cc @@ -37,9 +37,7 @@ DEAL_II_NAMESPACE_OPEN // include UMFPACK file. #ifdef HAVE_LIBUMFPACK -extern "C" { # include -} #endif // if the HSL functions are not there, define them empty and throw an -- 2.39.5