To: vim_dev@googlegroups.com Subject: Patch 8.1.0987 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.0987 Problem: Unnecessary condition in #ifdef. Solution: Remove using CYGWIN32. (Ken Takata) Files: src/os_unix.h, src/xxd/xxd.c *** ../vim-8.1.0986/src/os_unix.h 2018-12-21 11:48:48.320680492 +0100 --- src/os_unix.h 2019-03-02 07:11:31.998923994 +0100 *************** *** 33,39 **** # include #endif ! #if defined(__CYGWIN__) || defined(__CYGWIN32__) # define WIN32UNIX /* Compiling for Win32 using Unix files. */ # define BINARY_FILE_IO --- 33,39 ---- # include #endif ! #ifdef __CYGWIN__ # define WIN32UNIX /* Compiling for Win32 using Unix files. */ # define BINARY_FILE_IO *** ../vim-8.1.0986/src/xxd/xxd.c 2019-01-31 11:00:38.767870492 +0100 --- src/xxd/xxd.c 2019-03-02 07:11:31.998923994 +0100 *************** *** 71,77 **** # define _CRT_SECURE_NO_DEPRECATE # define _CRT_NONSTDC_NO_DEPRECATE #endif ! #if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__)) # define CYGWIN #endif --- 71,77 ---- # define _CRT_SECURE_NO_DEPRECATE # define _CRT_NONSTDC_NO_DEPRECATE #endif ! #if !defined(CYGWIN) && defined(__CYGWIN__) # define CYGWIN #endif *** ../vim-8.1.0986/src/version.c 2019-03-02 06:41:34.345330494 +0100 --- src/version.c 2019-03-02 07:14:29.773705050 +0100 *************** *** 781,782 **** --- 781,784 ---- { /* Add new patch number below this line */ + /**/ + 987, /**/ -- Tips for aliens in New York: Land anywhere. Central Park, anywhere. No one will care or indeed even notice. -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" /// 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 ///