Re: Patch 8.2.0460
On 28-Mar-2020 06:53, Bram Moolenaar wrote: John Marriott wrote: On 27-Mar-2020 09:14, Bram Moolenaar wrote: Patch 8.2.0460 (after 8.2.0459) Problem:Build failure because of wrong feature name. Solution: Correct feature name. Files: src/evalfunc.c I'm actually surprised it doesn't fail on more systems. Since t_channel and t_job are always defined, might as well do the same for t_float. Then we can remove the #ifdef's. Hi Bram, 8.2.0463 fixed it for me. Cheers John -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/d7b5212d-c104-a90f-bd4e-cdcf8ceaac2b%40internode.on.net.
Re: Patch 8.2.0460
John Marriott wrote: > On 27-Mar-2020 09:14, Bram Moolenaar wrote: > > Patch 8.2.0460 (after 8.2.0459) > > Problem:Build failure because of wrong feature name. > > Solution: Correct feature name. > > Files: src/evalfunc.c > > > > > > > After applying patches 8.2.0449 to 8.2.0460, HP-UX throws this error if > FEAT_FLOAT and FEAT_JOB_CHANNEL are not defined (I get an error to the > same effect from mingw64): > > cc -c -I. -Iproto -DHAVE_CONFIG_H -O2 -D_REENTRANT -o > objects/evalfunc.o evalfunc.c > cc: "evalfunc.c", line 421: error 1588: "ret_float" undefined. > cc: "evalfunc.c", line 421: error 1521: Incorrect initialization. > cc: "evalfunc.c", line 430: error 1521: Incorrect initialization. > cc: "evalfunc.c", line 443: error 1521: Incorrect initialization. > cc: "evalfunc.c", line 444: error 1521: Incorrect initialization. > cc: "evalfunc.c", line 484: error 1521: Incorrect initialization. > cc: "evalfunc.c", line 491: error 1588: "ret_job" undefined. > cc: "evalfunc.c", line 491: error 1521: Incorrect initialization. > cc: "evalfunc.c", line 495: error 1588: "ret_channel" undefined. > cc: "evalfunc.c", line 495: error 1521: Incorrect initialization. [...] > I'm not sure of the correct fix, so I have put together three different > possibilities, all of which appear to fix the problem both on HP-UX and > mingw64. I'm actually surprised it doesn't fail on more systems. Since t_channel and t_job are always defined, might as well do the same for t_float. Then we can remove the #ifdef's. -- BLACK KNIGHT: Come on you pansy! [hah] [parry thrust] [ARTHUR chops the BLACK KNIGHT's right arm off] ARTHUR:Victory is mine! [kneeling] We thank thee Lord, that in thy merc- [Black Knight kicks Arthur in the head while he is praying] The Quest for the Holy Grail (Monty Python) /// Bram Moolenaar -- b...@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/// -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/202003271953.02RJrPht028871%40masaka.moolenaar.net.
Re: Patch 8.2.0460
On 27-Mar-2020 09:14, Bram Moolenaar wrote:
Patch 8.2.0460 (after 8.2.0459)
Problem:Build failure because of wrong feature name.
Solution: Correct feature name.
Files: src/evalfunc.c
After applying patches 8.2.0449 to 8.2.0460, HP-UX throws this error if
FEAT_FLOAT and FEAT_JOB_CHANNEL are not defined (I get an error to the
same effect from mingw64):
cc -c -I. -Iproto -DHAVE_CONFIG_H -O2 -D_REENTRANT -o
objects/evalfunc.o evalfunc.c
cc: "evalfunc.c", line 421: error 1588: "ret_float" undefined.
cc: "evalfunc.c", line 421: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 430: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 443: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 444: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 484: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 491: error 1588: "ret_job" undefined.
cc: "evalfunc.c", line 491: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 495: error 1588: "ret_channel" undefined.
cc: "evalfunc.c", line 495: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 515: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 516: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 543: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 555: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 556: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 642: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 645: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 666: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 667: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 736: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 782: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 795: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 852: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 853: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 863: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 866: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 910: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 911: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 926: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 957: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 959: error 1521: Incorrect initialization.
cc: "evalfunc.c", line 987: error 1521: Incorrect initialization.
*** Error exit code 1
Stop.
*** Error exit code 1
Stop.
I'm not sure of the correct fix, so I have put together three different
possibilities, all of which appear to fix the problem both on HP-UX and
mingw64.
Regards
John
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups "vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/1c3dae00-776c-979b-0448-0835d5b6104b%40internode.on.net.
--- evalfunc.c.orig 2020-03-27 09:22:12.0 +1100
+++ evalfunc.c 2020-03-27 09:30:05.777314100 +1100
@@ -418,7 +418,9 @@
static funcentry_T global_functions[] =
{
{"abs",1, 1, FEARG_1,ret_any, FLOAT_FUNC(f_abs)},
+#ifdef FEAT_FLOAT
{"acos", 1, 1, FEARG_1,ret_float,FLOAT_FUNC(f_acos)},
+#endif
{"add",2, 2, FEARG_1,ret_any, f_add},
{"and",2, 2, FEARG_1,ret_number, f_and},
{"append", 2, 2, FEARG_LAST, ret_number, f_append},
@@ -427,7 +429,9 @@
{"argidx", 0, 0, 0, ret_number, f_argidx},
{"arglistid", 0, 2, 0, ret_number, f_arglistid},
{"argv", 0, 2, 0, ret_any, f_argv},
+#ifdef FEAT_FLOAT
{"asin", 1, 1, FEARG_1,ret_float,FLOAT_FUNC(f_asin)},
+#endif
{"assert_beeps", 1, 2, FEARG_1,ret_number, f_assert_beeps},
{"assert_equal", 2, 3, FEARG_2,ret_number, f_assert_equal},
{"assert_equalfile", 2, 2, FEARG_1, ret_number,
f_assert_equalfile},
@@ -440,8 +444,10 @
Patch 8.2.0460
Patch 8.2.0460 (after 8.2.0459)
Problem:Build failure because of wrong feature name.
Solution: Correct feature name.
Files: src/evalfunc.c
*** ../vim-8.2.0459/src/evalfunc.c 2020-03-26 22:16:44.307582067 +0100
--- src/evalfunc.c 2020-03-26 23:11:49.707859653 +0100
***
*** 915,921
{"term_dumpwrite",2, 3, FEARG_2,ret_void,
TERM_FUNC(f_term_dumpwrite)},
{"term_getaltscreen", 1, 1, FEARG_1, ret_number,
TERM_FUNC(f_term_getaltscreen)},
{"term_getansicolors", 1, 1, FEARG_1, ret_list_string,
! #if defined(TERMINAL) && (defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS))
f_term_getansicolors
#else
NULL
--- 915,921
{"term_dumpwrite",2, 3, FEARG_2,ret_void,
TERM_FUNC(f_term_dumpwrite)},
{"term_getaltscreen", 1, 1, FEARG_1, ret_number,
TERM_FUNC(f_term_getaltscreen)},
{"term_getansicolors", 1, 1, FEARG_1, ret_list_string,
! #if defined(FEAT_TERMINAL) && (defined(FEAT_GUI) ||
defined(FEAT_TERMGUICOLORS))
f_term_getansicolors
#else
NULL
***
*** 934,940
{"term_scrape", 2, 2, FEARG_1,ret_list_dict_any,
TERM_FUNC(f_term_scrape)},
{"term_sendkeys", 2, 2, FEARG_1,ret_void,
TERM_FUNC(f_term_sendkeys)},
{"term_setansicolors", 2, 2, FEARG_1, ret_void,
! #if defined(TERMINAL) && (defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS))
f_term_setansicolors
#else
NULL
--- 934,940
{"term_scrape", 2, 2, FEARG_1,ret_list_dict_any,
TERM_FUNC(f_term_scrape)},
{"term_sendkeys", 2, 2, FEARG_1,ret_void,
TERM_FUNC(f_term_sendkeys)},
{"term_setansicolors", 2, 2, FEARG_1, ret_void,
! #if defined(FEAT_TERMINAL) && (defined(FEAT_GUI) ||
defined(FEAT_TERMGUICOLORS))
f_term_setansicolors
#else
NULL
*** ../vim-8.2.0459/src/version.c 2020-03-26 22:16:44.307582067 +0100
--- src/version.c 2020-03-26 23:13:18.063588215 +0100
***
*** 740,741
--- 740,743
{ /* Add new patch number below this line */
+ /**/
+ 460,
/**/
--
With sufficient thrust, pigs fly just fine.
-- RFC 1925
/// Bram Moolenaar -- b...@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///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/202003262214.02QME5gI013106%40masaka.moolenaar.net.
