comparison src/os_unix.c @ 15955:907481b9260f v8.1.0983

patch 8.1.0983: checking __CYGWIN32__ unnecessarily commit https://github.com/vim/vim/commit/1eed532999adc6a2c902fa07d256be988520a995 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Feb 26 17:03:54 2019 +0100 patch 8.1.0983: checking __CYGWIN32__ unnecessarily Problem: Checking __CYGWIN32__ unnecessarily. Solution: Remove the checks. (Ken Takata)
author Bram Moolenaar <Bram@vim.org>
date Tue, 26 Feb 2019 17:15:13 +0100
parents 7fad90423bd2
children ddd82b1c9e9d
comparison
equal deleted inserted replaced
15954:4cab61f1d8d4 15955:907481b9260f
1603 static int 1603 static int
1604 x_IOerror_check(Display *dpy UNUSED) 1604 x_IOerror_check(Display *dpy UNUSED)
1605 { 1605 {
1606 /* This function should not return, it causes exit(). Longjump instead. */ 1606 /* This function should not return, it causes exit(). Longjump instead. */
1607 LONGJMP(lc_jump_env, 1); 1607 LONGJMP(lc_jump_env, 1);
1608 # if defined(VMS) || defined(__CYGWIN__) || defined(__CYGWIN32__) 1608 # if defined(VMS) || defined(__CYGWIN__)
1609 return 0; /* avoid the compiler complains about missing return value */ 1609 return 0; /* avoid the compiler complains about missing return value */
1610 # endif 1610 # endif
1611 } 1611 }
1612 # endif 1612 # endif
1613 1613
1625 x11_display = NULL; 1625 x11_display = NULL;
1626 xterm_Shell = (Widget)0; 1626 xterm_Shell = (Widget)0;
1627 1627
1628 /* This function should not return, it causes exit(). Longjump instead. */ 1628 /* This function should not return, it causes exit(). Longjump instead. */
1629 LONGJMP(x_jump_env, 1); 1629 LONGJMP(x_jump_env, 1);
1630 # if defined(VMS) || defined(__CYGWIN__) || defined(__CYGWIN32__) 1630 # if defined(VMS) || defined(__CYGWIN__)
1631 return 0; /* avoid the compiler complains about missing return value */ 1631 return 0; /* avoid the compiler complains about missing return value */
1632 # endif 1632 # endif
1633 } 1633 }
1634 1634
1635 /* 1635 /*
6711 vim_free(buffer); 6711 vim_free(buffer);
6712 return FAIL; 6712 return FAIL;
6713 } 6713 }
6714 vim_free(tempname); 6714 vim_free(tempname);
6715 6715
6716 # if defined(__CYGWIN__) || defined(__CYGWIN32__) 6716 # ifdef __CYGWIN__
6717 /* Translate <CR><NL> into <NL>. Caution, buffer may contain NUL. */ 6717 /* Translate <CR><NL> into <NL>. Caution, buffer may contain NUL. */
6718 p = buffer; 6718 p = buffer;
6719 for (i = 0; i < (int)len; ++i) 6719 for (i = 0; i < (int)len; ++i)
6720 if (!(buffer[i] == CAR && buffer[i + 1] == NL)) 6720 if (!(buffer[i] == CAR && buffer[i + 1] == NL))
6721 *p++ = buffer[i]; 6721 *p++ = buffer[i];