To: vim_dev@googlegroups.com Subject: Patch 9.0.1341 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.1341 Problem: Build error with mzscheme but without GUI. Solution: Adjust #ifdefs. (Ken Takata, closes #12042) Also fix function argument. Files: src/if_mzsch.c, src/proto/if_mzsch.pro *** ../vim-9.0.1340/src/if_mzsch.c 2023-02-20 12:16:33.332269406 +0000 --- src/if_mzsch.c 2023-02-22 13:13:20.678854309 +0000 *************** *** 886,904 **** timer_id = 0; } char * ! did_set_mzquantum(void) { // reset timer if (timer_id != 0) remove_timer(); if (mz_threads_allow && p_mzq > 0 && gui.in_use) setup_timer(); return NULL; } - #endif // MZSCHEME_GUI_THREADS - static void notify_multithread(int on) { --- 886,906 ---- timer_id = 0; } + #endif // MZSCHEME_GUI_THREADS + char * ! did_set_mzquantum(optset_T *args UNUSED) { + #if defined(MZSCHEME_GUI_THREADS) // reset timer if (timer_id != 0) remove_timer(); if (mz_threads_allow && p_mzq > 0 && gui.in_use) setup_timer(); + #endif return NULL; } static void notify_multithread(int on) { *** ../vim-9.0.1340/src/proto/if_mzsch.pro 2023-02-20 12:16:33.332269406 +0000 --- src/proto/if_mzsch.pro 2023-02-22 13:13:25.178859107 +0000 *************** *** 1,7 **** /* if_mzsch.c */ int mzscheme_enabled(int verbose); void mzvim_check_threads(void); ! char *did_set_mzquantum(void); void mzscheme_end(void); int mzscheme_main(void); void mzscheme_buffer_free(buf_T *buf); --- 1,7 ---- /* if_mzsch.c */ int mzscheme_enabled(int verbose); void mzvim_check_threads(void); ! char *did_set_mzquantum(optset_T *args); void mzscheme_end(void); int mzscheme_main(void); void mzscheme_buffer_free(buf_T *buf); *** ../vim-9.0.1340/src/version.c 2023-02-22 12:35:13.874234570 +0000 --- src/version.c 2023-02-22 13:13:59.210895141 +0000 *************** *** 697,698 **** --- 697,700 ---- { /* Add new patch number below this line */ + /**/ + 1341, /**/ -- "The question of whether computers can think is just like the question of whether submarines can swim." -- Edsger W. Dijkstra /// 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 ///