To: vim_dev@googlegroups.com Subject: Patch 8.1.2397 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2397 Problem: Should not define __USE_XOPEN. _XOPEN_SOURCE is not needed for Android. Solution: Remove __USE_XOPEN and adjust #ifdefs. (Ozaki Kiichi, closes #5322) Files: src/vim.h *** ../vim-8.1.2396/src/vim.h 2019-11-30 22:47:42.659331167 +0100 --- src/vim.h 2019-12-05 23:05:26.598184948 +0100 *************** *** 36,42 **** Error: configure did not run properly. Check auto/config.log. # endif ! # if defined(__gnu_linux__) || defined(__CYGWIN__) // Needed for strptime(). Needs to be done early, since header files can // include other header files and end up including time.h, where these symbols // matter for Vim. --- 36,42 ---- Error: configure did not run properly. Check auto/config.log. # endif ! # if (defined(__linux__) && !defined(__ANDROID__)) || defined(__CYGWIN__) // Needed for strptime(). Needs to be done early, since header files can // include other header files and end up including time.h, where these symbols // matter for Vim. *************** *** 44,52 **** # ifndef _XOPEN_SOURCE # define _XOPEN_SOURCE 700 # endif - # ifndef __USE_XOPEN - # define __USE_XOPEN - # endif # endif // for INT_MAX, LONG_MAX et al. --- 44,49 ---- *** ../vim-8.1.2396/src/version.c 2019-12-05 21:49:57.127238072 +0100 --- src/version.c 2019-12-05 23:06:48.769906977 +0100 *************** *** 744,745 **** --- 744,747 ---- { /* Add new patch number below this line */ + /**/ + 2397, /**/ -- Some of the well known MS-Windows errors: EMULTI Multitasking attempted, system confused EKEYBOARD Keyboard locked, try getting out of this one! EXPLAIN Unexplained error, please tell us what happened EFUTURE Reserved for our future mistakes /// 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 ///