To: vim_dev@googlegroups.com Subject: Patch 8.2.1932 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1932 Problem: Compiler warnings when building with Athena GUI. Solution: Fix function signatures. Files: src/gui_at_fs.c *** ../vim-8.2.1931/src/gui_at_fs.c 2019-12-01 21:55:41.000000000 +0100 --- src/gui_at_fs.c 2020-11-01 13:28:29.205741939 +0100 *************** *** 179,187 **** static void SFdrawList(int n, int doScroll); static void SFclearList(int n, int doScroll); static char SFstatChar(stat_T *statBuf); ! static void SFmotionList(Widget w, int n, XMotionEvent *event); static void SFvSliderMovedCallback(Widget w, int n, int nw); ! static Boolean SFworkProc(void); static int SFcompareEntries(const void *p, const void *q); ////////////////// xstat.h --- 179,187 ---- static void SFdrawList(int n, int doScroll); static void SFclearList(int n, int doScroll); static char SFstatChar(stat_T *statBuf); ! static void SFmotionList(Widget w, XtPointer np, XMotionEvent *event, Boolean *cont); static void SFvSliderMovedCallback(Widget w, int n, int nw); ! static Boolean SFworkProc(void *); static int SFcompareEntries(const void *p, const void *q); ////////////////// xstat.h *************** *** 798,816 **** static void SFbuttonPressList( ! Widget w UNUSED, ! int n UNUSED, ! XButtonPressedEvent *event UNUSED) { SFbuttonPressed = 1; } static void SFbuttonReleaseList( ! Widget w, ! int n, ! XButtonReleasedEvent *event) { SFDir *dir; SFbuttonPressed = 0; --- 798,819 ---- static void SFbuttonPressList( ! Widget w UNUSED, ! XtPointer np UNUSED, ! XEvent *event UNUSED, ! Boolean *cont UNUSED) { SFbuttonPressed = 1; } static void SFbuttonReleaseList( ! Widget w UNUSED, ! XtPointer np, ! XEvent *event UNUSED, ! Boolean *cont UNUSED) { + long n = (long)np; SFDir *dir; SFbuttonPressed = 0; *************** *** 823,829 **** dir = &(SFdirs[SFdirPtr + n]); SFreplaceText(dir, dir->entries[dir->vOrigin + SFcurrentInvert[n]].shown); ! SFmotionList(w, n, (XMotionEvent *) event); } } --- 826,832 ---- dir = &(SFdirs[SFdirPtr + n]); SFreplaceText(dir, dir->entries[dir->vOrigin + SFcurrentInvert[n]].shown); ! SFmotionList(w, (XtPointer)(long)n, (XMotionEvent *)event, 0); } } *************** *** 1600,1608 **** } static void ! SFenterList(Widget w UNUSED, int n, XEnterWindowEvent *event) { ! int nw; // sanity if (SFcurrentInvert[n] != -1) --- 1603,1616 ---- } static void ! SFenterList( ! Widget w UNUSED, ! XtPointer np, ! XEvent *event, ! Boolean *cont UNUSED) { ! long n = (long)np; ! int nw; // sanity if (SFcurrentInvert[n] != -1) *************** *** 1620,1627 **** } static void ! SFleaveList(Widget w UNUSED, int n, XEvent *event UNUSED) { if (SFcurrentInvert[n] != -1) { SFinvertEntry(n); --- 1628,1641 ---- } static void ! SFleaveList( ! Widget w UNUSED, ! XtPointer np, ! XEvent *event UNUSED, ! Boolean *cont UNUSED) { + long n = (long)np; + if (SFcurrentInvert[n] != -1) { SFinvertEntry(n); *************** *** 1630,1637 **** } static void ! SFmotionList(Widget w UNUSED, int n, XMotionEvent *event) { int nw; nw = SFnewInvertEntry(n, event); --- 1644,1656 ---- } static void ! SFmotionList( ! Widget w UNUSED, ! XtPointer np, ! XMotionEvent *event UNUSED, ! Boolean *cont UNUSED) { + long n = (long)np; int nw; nw = SFnewInvertEntry(n, event); *************** *** 1954,1960 **** } static Boolean ! SFworkProc(void) { SFDir *dir; SFEntry *entry; --- 1973,1979 ---- } static Boolean ! SFworkProc(void *arg UNUSED) { SFDir *dir; SFEntry *entry; *** ../vim-8.2.1931/src/version.c 2020-10-31 19:33:34.531695411 +0100 --- src/version.c 2020-11-01 13:29:19.893574343 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 1932, /**/ -- Living in Hollywood is like living in a bowl of granola. What ain't fruits and nuts is flakes. /// 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 ///