Mercurial > octave
diff liboctave/array/CSparse.cc @ 21229:a83e7a384ee0
create and install a subset of config.h in octave-config.h
* mk-octave-config-h.sh: New file.
* Makefile.am (EXTRA_DIST): Add mk-octave-config.h.sh to the list.
(octinclude_HEADERS): Add octave-config.h to the list.
(octave-config.h): New rule.
* common.mk (do_subst_config_vals, do_subst_cross_config_vals):
Don't substitute unused ENABLE options.
* configure.ac: Note the reason for using oct-conf-post.in.h.
Add OCTAVE_ prefix to ENABLE_BOUNDS_CHECK ENABLE_ATOMIC_REFCOUNT,
ENABLE_64, ENABLE_OPENMP, and ENABLE_FLOAT_TRUNCATE in calls to
AC_DEFINE. Change all uses.
* oct-conf-post.in.h: Define HAVE_OCTAVE_DEPRECATED_ATTR instead of
HAVE_ATTR_DEPRECATED. Likewise for HAVE_ATTR_NORETURN and
HAVE_ATTR_UNUSED. Change all uses.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 08 Feb 2016 17:30:29 -0500 |
| parents | ddf0a5f3a967 |
| children | 40de9f8f23a6 |
line wrap: on
line diff
--- a/liboctave/array/CSparse.cc Mon Feb 08 20:45:26 2016 -0500 +++ b/liboctave/array/CSparse.cc Mon Feb 08 17:30:29 2016 -0500 @@ -5601,7 +5601,7 @@ A->packed = true; A->sorted = true; A->nz = 0; -#if defined (ENABLE_64) +#if defined (OCTAVE_ENABLE_64) A->itype = CHOLMOD_LONG; #else A->itype = CHOLMOD_INT; @@ -5847,7 +5847,7 @@ A->packed = true; A->sorted = true; A->nz = 0; -#if defined (ENABLE_64) +#if defined (OCTAVE_ENABLE_64) A->itype = CHOLMOD_LONG; #else A->itype = CHOLMOD_INT; @@ -5871,7 +5871,7 @@ B->packed = true; B->sorted = true; B->nz = 0; -#if defined (ENABLE_64) +#if defined (OCTAVE_ENABLE_64) B->itype = CHOLMOD_LONG; #else B->itype = CHOLMOD_INT; @@ -6141,7 +6141,7 @@ A->packed = true; A->sorted = true; A->nz = 0; -#if defined (ENABLE_64) +#if defined (OCTAVE_ENABLE_64) A->itype = CHOLMOD_LONG; #else A->itype = CHOLMOD_INT; @@ -6366,7 +6366,7 @@ A->packed = true; A->sorted = true; A->nz = 0; -#if defined (ENABLE_64) +#if defined (OCTAVE_ENABLE_64) A->itype = CHOLMOD_LONG; #else A->itype = CHOLMOD_INT; @@ -6390,7 +6390,7 @@ B->packed = true; B->sorted = true; B->nz = 0; -#if defined (ENABLE_64) +#if defined (OCTAVE_ENABLE_64) B->itype = CHOLMOD_LONG; #else B->itype = CHOLMOD_INT;