Patch 8.2.4316
Problem:    __CYGWIN32__ is not defined on 64 bit systems.
Solution:   Update #ifdefs. (Ken Takata, closes #9709)
Files:      src/main.c, src/os_unix.c, src/pty.c, src/vim.h


*** ../vim-8.2.4315/src/main.c  2022-02-05 12:39:20.854792149 +0000
--- src/main.c  2022-02-07 10:41:40.011582992 +0000
***************
*** 2571,2577 ****
                }
            }
  #endif
! #ifdef __CYGWIN32__
            /*
             * If vim is invoked by non-Cygwin tools, convert away any
             * DOS paths, so things like .swp files are created correctly.
--- 2571,2577 ----
                }
            }
  #endif
! #ifdef __CYGWIN__
            /*
             * If vim is invoked by non-Cygwin tools, convert away any
             * DOS paths, so things like .swp files are created correctly.
*** ../vim-8.2.4315/src/os_unix.c       2022-02-04 10:45:34.944240854 +0000
--- src/os_unix.c       2022-02-07 10:41:40.011582992 +0000
***************
*** 6341,6347 ****
        FD_ZERO(&wfds);
        FD_ZERO(&efds);
        FD_SET(fd, &rfds);
! # if !defined(__QNX__) && !defined(__CYGWIN32__)
        // For QNX select() always returns 1 if this is set.  Why?
        FD_SET(fd, &efds);
  # endif
--- 6341,6347 ----
        FD_ZERO(&wfds);
        FD_ZERO(&efds);
        FD_SET(fd, &rfds);
! # ifndef __QNX__
        // For QNX select() always returns 1 if this is set.  Why?
        FD_SET(fd, &efds);
  # endif
*** ../vim-8.2.4315/src/pty.c   2020-05-30 17:14:37.828521058 +0100
--- src/pty.c   2022-02-07 10:41:40.011582992 +0000
***************
*** 46,55 ****
  
  #include <signal.h>
  
- #ifdef __CYGWIN32__
- # include <sys/termios.h>
- #endif
- 
  #ifdef HAVE_SYS_IOCTL_H
  # include <sys/ioctl.h>
  #endif
--- 46,51 ----
*** ../vim-8.2.4315/src/vim.h   2022-01-28 20:47:44.103611022 +0000
--- src/vim.h   2022-02-07 10:41:40.011582992 +0000
***************
*** 1576,1585 ****
  #endif
  
  /*
!  * EMX doesn't have a global way of making open() use binary I/O.
   * Use O_BINARY for all open() calls.
   */
! #if defined(__CYGWIN32__)
  # define O_EXTRA    O_BINARY
  #else
  # define O_EXTRA    0
--- 1576,1585 ----
  #endif
  
  /*
!  * Cygwin doesn't have a global way of making open() use binary I/O.
   * Use O_BINARY for all open() calls.
   */
! #ifdef __CYGWIN__
  # define O_EXTRA    O_BINARY
  #else
  # define O_EXTRA    0
*** ../vim-8.2.4315/src/version.c       2022-02-07 10:33:15.412898083 +0000
--- src/version.c       2022-02-07 10:44:30.247138481 +0000
***************
*** 748,749 ****
--- 748,751 ----
  {   /* Add new patch number below this line */
+ /**/
+     4316,
  /**/

-- 
When a fly lands on the ceiling, does it do a half roll or
a half loop?

 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/vim_dev/20220207104628.C700A1C0345%40moolenaar.net.

Raspunde prin e-mail lui