Mercurial > octave

comparison m4/acinclude.m4 @ 21140:e06e600f396a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate use of USE_64_BIT_IDX_T * common.mk (do_subst_config_vals, do_subst_cross_config_vals): Don't substitute OCTAVE_CONF_USE_64_BIT_IDX_T. * toplev.cc (octave_config_info): Set USE_64_BIT_IDX_T from OCTAVE_CONF_ENABLE_64. * oct-conf.in.h (OCTAVE_CONF_USE_64_BIT_IDX_T): Delete macro. * oct-hdf5.h, amd.cc, ccolamd.cc, colamd.cc, dmperm.cc, symbfact.cc, ov.cc, CSparse.cc, CSparse.h, MArray-i.cc, dSparse.cc, dSparse.h, SparseCmplxQR.h, SparseQR.h, sparse-base-chol.cc, lo-array-errwarn.cc, lo-array-gripes.cc, oct-sparse.h, acinclude.m4, oct-conf-post.in.h, computer.m: Use ENABLE_64 instead of USE_64_BIT_IDX_T.
author John W. Eaton <jwe@octave.org>
date Mon, 25 Jan 2016 19:16:31 -0500
parents 5b7643257978
children 7962dbca527f
comparison
equal deleted inserted replaced
21139:538b57866b90 21140:e06e600f396a
1228 AC_LANG_PUSH(C) 1228 AC_LANG_PUSH(C)
1229 AC_RUN_IFELSE([AC_LANG_PROGRAM([[ 1229 AC_RUN_IFELSE([AC_LANG_PROGRAM([[
1230 #include <assert.h> 1230 #include <assert.h>
1231 #include <stdint.h> 1231 #include <stdint.h>
1232 ]], [[ 1232 ]], [[
1233 #ifdef USE_64_BIT_IDX_T 1233 #ifdef ENABLE_64
1234 typedef int64_t octave_idx_type; 1234 typedef int64_t octave_idx_type;
1235 #else 1235 #else
1236 typedef int octave_idx_type; 1236 typedef int octave_idx_type;
1237 #endif 1237 #endif
1238 octave_idx_type n = 2; 1238 octave_idx_type n = 2;
2405 #elif defined (HAVE_UMFPACK_UMFPACK_H) 2405 #elif defined (HAVE_UMFPACK_UMFPACK_H)
2406 # include <umfpack/umfpack.h> 2406 # include <umfpack/umfpack.h>
2407 #elif defined (HAVE_UMFPACK_H) 2407 #elif defined (HAVE_UMFPACK_H)
2408 # include <umfpack.h> 2408 # include <umfpack.h>
2409 #endif 2409 #endif
2410 #ifdef USE_64_BIT_IDX_T 2410 #ifdef ENABLE_64
2411 typedef uint64_t idx_type; 2411 typedef uint64_t idx_type;
2412 #define UMFPACK_NAME(name) umfpack_zl_ ## name 2412 #define UMFPACK_NAME(name) umfpack_zl_ ## name
2413 #else 2413 #else
2414 typedef int idx_type; 2414 typedef int idx_type;
2415 #define UMFPACK_NAME(name) umfpack_zi_ ## name 2415 #define UMFPACK_NAME(name) umfpack_zi_ ## name