Mercurial > octave
changeset 22842:60405b73e439
provide separate typedefs for octave_idx_type and octave_f77_int_type
* configure.ac: Also substitute and define OCTAVE_F77_INT_TYPE.
* octave-conf-post.in.h: New typedef for octave_f77_int_type.
* f77-fcn.h: Define F77_INT and F77_LOGICAL using octave_f77_int_type
instead of octave_idx_type.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 29 Nov 2016 00:32:35 -0500 |
| parents | 5605a786086d |
| children | a2809b2938d6 |
| files | configure.ac liboctave/cruft/misc/f77-fcn.h oct-conf-post.in.h |
| diffstat | 3 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Tue Nov 29 00:20:23 2016 -0500 +++ b/configure.ac Tue Nov 29 00:32:35 2016 -0500 @@ -355,6 +355,10 @@ AC_SUBST(OCTAVE_IDX_TYPE) AC_DEFINE_UNQUOTED(OCTAVE_IDX_TYPE, [$OCTAVE_IDX_TYPE], [Define to the type of octave_idx_type (64 or 32 bit signed integer).]) +OCTAVE_F77_INT_TYPE=$OCTAVE_IDX_TYPE +AC_SUBST(OCTAVE_F77_INT_TYPE) +AC_DEFINE_UNQUOTED(OCTAVE_F77_INT_TYPE, [$OCTAVE_F77_INT_TYPE], + [Define to the type of octave_f77_int_type (64 or 32 bit signed integer).]) if test $ENABLE_64 = yes; then AC_DEFINE(OCTAVE_ENABLE_64, 1, [Define to 1 if using 64-bit integers for array dimensions and indexing.])
--- a/liboctave/cruft/misc/f77-fcn.h Tue Nov 29 00:20:23 2016 -0500 +++ b/liboctave/cruft/misc/f77-fcn.h Tue Nov 29 00:32:35 2016 -0500 @@ -332,9 +332,9 @@ typedef float F77_REAL; typedef double _Complex F77_DBLE_CMPLX; typedef float _Complex F77_CMPLX; -typedef octave_idx_type F77_INT; +typedef octave_f77_int_type F77_INT; typedef int32_t F77_INT4; -typedef octave_idx_type F77_LOGICAL; +typedef octave_f77_int_type F77_LOGICAL; #define F77_CMPLX_ARG(x) \ reinterpret_cast<float _Complex *> (x)
--- a/oct-conf-post.in.h Tue Nov 29 00:20:23 2016 -0500 +++ b/oct-conf-post.in.h Tue Nov 29 00:32:35 2016 -0500 @@ -189,6 +189,7 @@ #endif typedef OCTAVE_IDX_TYPE octave_idx_type; +typedef OCTAVE_F77_INT_TYPE octave_f77_int_type; /* Tag indicating Octave's autoconf-generated config.h has been included. This symbol is provided because autoconf-generated