diff options
| author | Felipe Oliveira Carvalho <felipekde@gmail.com> | 2014-03-26 17:08:47 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-03-26 18:29:17 -0300 |
| commit | 580ababcb5b822aaf938defa38a0ffd5511f0d65 (patch) | |
| tree | 86aac7cbaa8849b9917753d1a4ff3b58d00a20e6 /src/option.c | |
| parent | 83161200c473293b2d8d69e3ee1899c6a7199e38 (diff) | |
| download | rneovim-580ababcb5b822aaf938defa38a0ffd5511f0d65.tar.gz rneovim-580ababcb5b822aaf938defa38a0ffd5511f0d65.tar.bz2 rneovim-580ababcb5b822aaf938defa38a0ffd5511f0d65.zip | |
HAVE_AVAIL_MEM is always undefined. Remove tests and dead code
Defining HAVE_AVAIL_MEM doesn't even build. The code tries to call
`mch_avail_mem` which is not defined.
Diffstat (limited to 'src/option.c')
| -rw-r--r-- | src/option.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/option.c b/src/option.c index 1bbd331816..72c3f2b7d0 100644 --- a/src/option.c +++ b/src/option.c @@ -2024,25 +2024,20 @@ void set_init_1(void) */ opt_idx = findoption((char_u *)"maxmemtot"); if (opt_idx >= 0) { -#if !defined(HAVE_AVAIL_MEM) && !defined(HAVE_TOTAL_MEM) +#ifndef HAVE_TOTAL_MEM if (options[opt_idx].def_val[VI_DEFAULT] == (char_u *)0L) #endif { -#ifdef HAVE_AVAIL_MEM - /* Use amount of memory available at this moment. */ - n = (mch_avail_mem(FALSE) >> 1); -#else -# ifdef HAVE_TOTAL_MEM +#ifdef HAVE_TOTAL_MEM /* Use amount of memory available to Vim. */ n = (mch_total_mem(FALSE) >> 1); -# else +#else n = (0x7fffffff >> 11); -# endif #endif options[opt_idx].def_val[VI_DEFAULT] = (char_u *)n; opt_idx = findoption((char_u *)"maxmem"); if (opt_idx >= 0) { -#if !defined(HAVE_AVAIL_MEM) && !defined(HAVE_TOTAL_MEM) +#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 |