To: vim_dev@googlegroups.com Subject: Patch 8.2.4368 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4368 Problem: Amiga: a few compiler warnings. Solution: Adjust #ifdefs. Add "UNUSED". (Ola Söder, closes #9756, closes #9757) Files: src/term.c, src/os_amiga.c *** ../vim-8.2.4367/src/term.c 2022-01-31 14:59:33.526943578 +0000 --- src/term.c 2022-02-13 12:10:46.182293639 +0000 *************** *** 37,43 **** * A few linux systems define outfuntype in termcap.h to be used as the third * argument for tputs(). */ ! # ifdef VMS # define TPUTSFUNCAST (void (*)(unsigned int)) # else # ifdef HAVE_OUTFUNTYPE --- 37,43 ---- * A few linux systems define outfuntype in termcap.h to be used as the third * argument for tputs(). */ ! # if defined(VMS) || defined(AMIGA) # define TPUTSFUNCAST (void (*)(unsigned int)) # else # ifdef HAVE_OUTFUNTYPE *** ../vim-8.2.4367/src/os_amiga.c 2022-02-10 20:21:00.442383178 +0000 --- src/os_amiga.c 2022-02-13 12:10:55.350282560 +0000 *************** *** 154,160 **** char_u *buf, int maxlen, long time, // milliseconds ! int tb_change_cnt) { int len; long utime; --- 154,160 ---- char_u *buf, int maxlen, long time, // milliseconds ! int tb_change_cnt UNUSED) { int len; long utime; *************** *** 571,577 **** void fname_case( char_u *name, ! int len) // buffer size, ignored here { struct FileInfoBlock *fib; size_t flen; --- 571,577 ---- void fname_case( char_u *name, ! int len UNUSED) // buffer size, ignored here { struct FileInfoBlock *fib; size_t flen; *************** *** 837,843 **** * Set hidden flag for "name". */ void ! mch_hide(char_u *name) { // can't hide a file } --- 837,843 ---- * Set hidden flag for "name". */ void ! mch_hide(char_u *name UNUSED) { // can't hide a file } *************** *** 889,895 **** * Return -1 if unknown. */ int ! mch_can_exe(char_u *name, char_u **path, int use_path) { int exe = -1; #ifdef __amigaos4__ --- 889,895 ---- * Return -1 if unknown. */ int ! mch_can_exe(char_u *name, char_u **path UNUSED, int use_path) { int exe = -1; #ifdef __amigaos4__ *************** *** 942,948 **** * NODE_OTHER: non-writable things */ int ! mch_nodetype(char_u *name) { // TODO return NODE_NORMAL; --- 942,948 ---- * NODE_OTHER: non-writable things */ int ! mch_nodetype(char_u *name UNUSED) { // TODO return NODE_NORMAL; *************** *** 1490,1496 **** * trouble with lattice-c programs. */ void ! mch_breakcheck(int force) { if (SetSignal(0L, (long)(SIGBREAKF_CTRL_C|SIGBREAKF_CTRL_D|SIGBREAKF_CTRL_E|SIGBREAKF_CTRL_F)) & SIGBREAKF_CTRL_C) got_int = TRUE; --- 1490,1496 ---- * trouble with lattice-c programs. */ void ! mch_breakcheck(int force UNUSED) { if (SetSignal(0L, (long)(SIGBREAKF_CTRL_C|SIGBREAKF_CTRL_D|SIGBREAKF_CTRL_E|SIGBREAKF_CTRL_F)) & SIGBREAKF_CTRL_C) got_int = TRUE; *************** *** 1755,1761 **** */ // ARGSUSED int ! mch_setenv(char *var, char *value, int x) { #ifdef FEAT_ARP if (!dos2) --- 1755,1761 ---- */ // ARGSUSED int ! mch_setenv(char *var, char *value, int x UNUSED) { #ifdef FEAT_ARP if (!dos2) *** ../vim-8.2.4367/src/version.c 2022-02-13 11:57:25.283251618 +0000 --- src/version.c 2022-02-13 12:10:26.162321735 +0000 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 4368, /**/ -- Micro$oft: where do you want to go today? Linux: where do you want to go tomorrow? FreeBSD: are you guys coming, or what? /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///