To: vim_dev@googlegroups.com Subject: Patch 8.2.0463 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0463 Problem: Build error without float and channel feature. (John Marriott) Solution: Define return types always. Files: src/globals.h, src/evalfunc.c *** ../vim-8.2.0463/src/globals.h 2020-02-26 16:15:31.068386966 +0100 --- src/globals.h 2020-03-27 20:46:16.595576172 +0100 *************** *** 384,392 **** EXTERN type_T t_bool INIT4(VAR_BOOL, 0, NULL, NULL); EXTERN type_T t_special INIT4(VAR_SPECIAL, 0, NULL, NULL); EXTERN type_T t_number INIT4(VAR_NUMBER, 0, NULL, NULL); - # ifdef FEAT_FLOAT EXTERN type_T t_float INIT4(VAR_FLOAT, 0, NULL, NULL); - # endif EXTERN type_T t_string INIT4(VAR_STRING, 0, NULL, NULL); EXTERN type_T t_blob INIT4(VAR_BLOB, 0, NULL, NULL); EXTERN type_T t_job INIT4(VAR_JOB, 0, NULL, NULL); --- 384,390 ---- *** ../vim-8.2.0463/src/evalfunc.c 2020-03-26 23:13:30.067551209 +0100 --- src/evalfunc.c 2020-03-27 20:46:36.551506225 +0100 *************** *** 280,292 **** { return &t_number; } - #ifdef FEAT_FLOAT static type_T * ret_float(int argcount UNUSED, type_T **argtypes UNUSED) { return &t_float; } - #endif static type_T * ret_string(int argcount UNUSED, type_T **argtypes UNUSED) { --- 280,290 ---- *************** *** 336,342 **** { return &t_partial_void; } - #ifdef FEAT_JOB_CHANNEL static type_T * ret_channel(int argcount UNUSED, type_T **argtypes UNUSED) { --- 334,339 ---- *************** *** 347,353 **** { return &t_job; } - #endif static type_T *ret_f_function(int argcount, type_T **argtypes); --- 344,349 ---- *** ../vim-8.2.0463/src/version.c 2020-03-27 20:51:29.206483028 +0100 --- src/version.c 2020-03-27 20:50:11.930752775 +0100 *************** *** 740,741 **** --- 740,743 ---- { /* Add new patch number below this line */ + /**/ + 463, /**/ -- -rwxr-xr-x 1 root 24 Oct 29 1929 /bin/ed -rwxr-xr-t 4 root 131720 Jan 1 1970 /usr/ucb/vi -rwxr-xr-x 1 root 5.89824e37 Oct 22 1990 /usr/bin/emacs /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///