diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-08-07 02:20:12 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-08-07 02:20:12 -0400 |
| commit | ad5ae68acd3b0edae564064dfdc2b5b950d0b4e4 (patch) | |
| tree | 4e0abd7622a6fd1a832efd9a712d2594f2f464ef /src/nvim/option.c | |
| parent | 1fa3a7d70a99127e5dde3fdb9aa19684febb2ac7 (diff) | |
| parent | 8b72ae7c7875f47b7d775038700ee17ce71a2510 (diff) | |
| download | rneovim-ad5ae68acd3b0edae564064dfdc2b5b950d0b4e4.tar.gz rneovim-ad5ae68acd3b0edae564064dfdc2b5b950d0b4e4.tar.bz2 rneovim-ad5ae68acd3b0edae564064dfdc2b5b950d0b4e4.zip | |
Merge #814 'Remove dead #ifdefed code'
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 1e623041e7..ca49a3dcb8 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1933,26 +1933,15 @@ void set_init_1(void) */ opt_idx = findoption((char_u *)"maxmemtot"); if (opt_idx >= 0) { -#ifndef HAVE_TOTAL_MEM - if (options[opt_idx].def_val[VI_DEFAULT] == (char_u *)0L) -#endif { -#ifdef HAVE_TOTAL_MEM /* Use half of amount of memory available to Vim. */ /* If too much to fit in long_u, get long_u max */ uint64_t available_kib = os_get_total_mem_kib(); n = available_kib / 2 > ULONG_MAX ? ULONG_MAX : (long_u)(available_kib /2); -#else - n = (0x7fffffff >> 11); -#endif options[opt_idx].def_val[VI_DEFAULT] = (char_u *)n; opt_idx = findoption((char_u *)"maxmem"); if (opt_idx >= 0) { -#ifndef HAVE_TOTAL_MEM - if ((long)options[opt_idx].def_val[VI_DEFAULT] > (long)n - || (long)options[opt_idx].def_val[VI_DEFAULT] == 0L) -#endif options[opt_idx].def_val[VI_DEFAULT] = (char_u *)n; } } @@ -1995,7 +1984,7 @@ void set_init_1(void) } } -#if defined(MSWIN) || defined(EBCDIC) || defined(MAC) +#if defined(MSWIN) || defined(MAC) /* Set print encoding on platforms that don't default to latin1 */ set_string_default("penc", (char_u *)"hp-roman8" |