1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
|
To: vim_dev@googlegroups.com
Subject: Patch 8.1.0983
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 8.1.0983
Problem: Checking __CYGWIN32__ unnecessarily.
Solution: Remove the checks. (Ken Takata)
Files: src/evalfunc.c, src/os_unix.c, src/os_win32.c
*** ../vim-8.1.0982/src/evalfunc.c 2019-02-18 22:14:15.198135199 +0100
--- src/evalfunc.c 2019-02-26 16:58:06.575888744 +0100
***************
*** 6155,6161 ****
#ifdef MSWIN
"win32",
#endif
! #if defined(UNIX) && (defined(__CYGWIN32__) || defined(__CYGWIN__))
"win32unix",
#endif
#ifdef _WIN64
--- 6155,6161 ----
#ifdef MSWIN
"win32",
#endif
! #if defined(UNIX) && defined(__CYGWIN__)
"win32unix",
#endif
#ifdef _WIN64
*** ../vim-8.1.0982/src/os_unix.c 2019-02-17 17:44:36.219875473 +0100
--- src/os_unix.c 2019-02-26 16:58:06.575888744 +0100
***************
*** 1605,1611 ****
{
/* This function should not return, it causes exit(). Longjump instead. */
LONGJMP(lc_jump_env, 1);
! # if defined(VMS) || defined(__CYGWIN__) || defined(__CYGWIN32__)
return 0; /* avoid the compiler complains about missing return value */
# endif
}
--- 1605,1611 ----
{
/* This function should not return, it causes exit(). Longjump instead. */
LONGJMP(lc_jump_env, 1);
! # if defined(VMS) || defined(__CYGWIN__)
return 0; /* avoid the compiler complains about missing return value */
# endif
}
***************
*** 1627,1633 ****
/* This function should not return, it causes exit(). Longjump instead. */
LONGJMP(x_jump_env, 1);
! # if defined(VMS) || defined(__CYGWIN__) || defined(__CYGWIN32__)
return 0; /* avoid the compiler complains about missing return value */
# endif
}
--- 1627,1633 ----
/* This function should not return, it causes exit(). Longjump instead. */
LONGJMP(x_jump_env, 1);
! # if defined(VMS) || defined(__CYGWIN__)
return 0; /* avoid the compiler complains about missing return value */
# endif
}
***************
*** 6713,6719 ****
}
vim_free(tempname);
! # if defined(__CYGWIN__) || defined(__CYGWIN32__)
/* Translate <CR><NL> into <NL>. Caution, buffer may contain NUL. */
p = buffer;
for (i = 0; i < (int)len; ++i)
--- 6713,6719 ----
}
vim_free(tempname);
! # ifdef __CYGWIN__
/* Translate <CR><NL> into <NL>. Caution, buffer may contain NUL. */
p = buffer;
for (i = 0; i < (int)len; ++i)
*** ../vim-8.1.0982/src/os_win32.c 2019-02-17 17:44:36.219875473 +0100
--- src/os_win32.c 2019-02-26 16:58:06.575888744 +0100
***************
*** 2094,2101 ****
return TRUE;
}
! #if ((defined(__MINGW32__) || defined (__CYGWIN32__)) && \
! __MSVCRT_VERSION__ >= 0x800) || (defined(_MSC_VER) && _MSC_VER >= 1400)
/*
* Bad parameter handler.
*
--- 2094,2101 ----
return TRUE;
}
! #if (defined(__MINGW32__) && __MSVCRT_VERSION__ >= 0x800) || \
! (defined(_MSC_VER) && _MSC_VER >= 1400)
/*
* Bad parameter handler.
*
*** ../vim-8.1.0982/src/version.c 2019-02-25 06:28:53.754677936 +0100
--- src/version.c 2019-02-26 17:02:33.638021985 +0100
***************
*** 781,782 ****
--- 781,784 ----
{ /* Add new patch number below this line */
+ /**/
+ 983,
/**/
--
How To Keep A Healthy Level Of Insanity:
2. Page yourself over the intercom. Don't disguise your voice.
/// 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 ///
|
