Mercurial > octave-nkf

changeset 19241:4d460b124be3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation error when building without SuiteSparse * oct-sparse.h: Fix SuiteSparse version conditional to evaluate the SUITESPARSE_VER_CODE macro only when building with SuiteSparse.
author Mike Miller <mtmiller@ieee.org>
date Fri, 03 Oct 2014 23:26:14 -0400
parents 65cf441abc5e
children 5f21e0bff135
files liboctave/util/oct-sparse.h
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/util/oct-sparse.h	Fri Oct 03 17:16:59 2014 -0700
+++ b/liboctave/util/oct-sparse.h	Fri Oct 03 23:26:14 2014 -0400
@@ -96,12 +96,14 @@
 
 // Cope with new suitesparse versions
 //
-#if defined (SUITESPARSE_VERSION) && SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (4, 3)
-# define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (SuiteSparse_config.f_name = f_assign)
-# define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (SuiteSparse_config.f_name = CHOLMOD_NAME (f_assign))
-#else
-# define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (f_var = f_assign)
-# define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (f_var = CHOLMOD_NAME (f_assign))
+#if defined (SUITESPARSE_VERSION)
+# if SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (4, 3)
+#  define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (SuiteSparse_config.f_name = f_assign)
+#  define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (SuiteSparse_config.f_name = CHOLMOD_NAME (f_assign))
+# else
+#  define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (f_var = f_assign)
+#  define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (f_var = CHOLMOD_NAME (f_assign))
+# endif
 #endif
 
 #endif