diff options
| author | Peter Stephenson <pws@zsh.org> | 2015-09-21 14:39:21 +0100 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2015-09-21 14:42:22 +0100 |
| commit | 8b84419f45298ee564bd6fa2b531c8991b2a1983 (patch) | |
| tree | 7751501c719854d29d3dcc1f9bf0682eb0895f95 | |
| parent | 5476e011f16664e601092c1e94e3332efe80720f (diff) | |
| download | zsh-8b84419f45298ee564bd6fa2b531c8991b2a1983.tar.gz zsh-8b84419f45298ee564bd6fa2b531c8991b2a1983.tar.xz zsh-8b84419f45298ee564bd6fa2b531c8991b2a1983.zip | |
36577: supplement 36559 to using LONG_MAX for 64-bit long
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/zsh.h | 4 | ||||
| -rw-r--r-- | configure.ac | 6 |
3 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 221f57fbd..1dd57123c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,9 @@ 2015-09-21 Peter Stephenson <p.stephenson@samsung.com> + * 36577: configure.ac, Src/zsh.h: supplement 36559 to + use LONG_MAX for 64-bit long. + * unposted: Src/zsh.h: typo in 36559. 2015-09-19 Barton E. Schaefer <schaefer@zsh.org> diff --git a/Src/zsh.h b/Src/zsh.h index b98fc5c43..dd0596116 100644 --- a/Src/zsh.h +++ b/Src/zsh.h @@ -39,9 +39,13 @@ typedef ZSH_64_BIT_TYPE zlong; #if defined(ZLONG_IS_LONG_LONG) && defined(LLONG_MAX) #define ZLONG_MAX LLONG_MAX #else +#ifdef ZLONG_IS_LONG_64 +#define ZLONG_MAX LONG_MAX +#else /* umm... */ #define ZLONG_MAX ((zlong)9223372036854775807) #endif +#endif #ifdef ZSH_64_BIT_UTYPE typedef ZSH_64_BIT_UTYPE zulong; #else diff --git a/configure.ac b/configure.ac index d7db8ba8d..c3bd713c1 100644 --- a/configure.ac +++ b/configure.ac @@ -1079,9 +1079,15 @@ main() { return sizeof(ino_t) < 8; } fi AH_TEMPLATE([ZLONG_IS_LONG_LONG], [Define to 1 if the zlong type uses long long int.]) +AH_TEMPLATE([ZLONG_IS_LONG_64], +[Define to 1 if the zlong type uses 64-bit long int.]) if test "$zsh_cv_64_bit_type" = "long long"; then dnl Remember this so we can get (s)printf output right. AC_DEFINE(ZLONG_IS_LONG_LONG) +else + if test "$zsh_cv_64_bit_type" = "long"; then + AC_DEFINE(ZLONG_IS_LONG_64) + fi fi dnl We'll blithely assume (f)printf supports the same types as sprintf. |