1 To: vim_dev@googlegroups.com
4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
10 Patch 7.3.085 (after 7.3.083)
11 Problem: Inconsistency with preproc symbols. void * computation.
12 Solution: Include vimio.h from vim.h. Add type cast.
13 Files: src/eval.c, src/ex_cmds.c, src/ex_cmds2.c, src/fileio.c,
14 src/if_cscope.c, src/if_sniff.c, src/main.c, src/memfile.c,
15 src/memline.c, src/netbeans.c, src/os_msdos.c, src/os_mswin.c,
16 src/os_win16.c, src/os_win32.c, src/spell.c, src/tag.c,
20 *** ../vim-7.3.084/src/eval.c 2010-12-02 21:44:35.000000000 +0100
21 --- src/eval.c 2010-12-17 17:45:37.000000000 +0100
25 * eval.c: Expression evaluation.
27 - #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
28 - # include "vimio.h" /* for mch_open(), must be before vim.h */
34 *** ../vim-7.3.084/src/ex_cmds.c 2010-11-24 17:59:27.000000000 +0100
35 --- src/ex_cmds.c 2010-12-17 17:46:09.000000000 +0100
38 * ex_cmds.c: some functions for command line commands
41 - #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
42 - # include "vimio.h" /* for mch_open(), must be before vim.h */
49 *** ../vim-7.3.084/src/ex_cmds2.c 2010-09-21 16:56:29.000000000 +0200
50 --- src/ex_cmds2.c 2010-12-17 17:46:26.000000000 +0100
53 * ex_cmds2.c: some more functions for command line commands
56 - #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
57 - # include "vimio.h" /* for mch_open(), must be before vim.h */
64 *** ../vim-7.3.084/src/fileio.c 2010-12-17 16:27:09.000000000 +0100
65 --- src/fileio.c 2010-12-17 17:52:42.000000000 +0100
68 * fileio.c: read from and write to a file
71 - #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
72 - # include "vimio.h" /* for lseek(), must be before vim.h */
76 - # include "vimio.h" /* for mktemp(), CJW 1997-12-03 */
81 #if defined(__TANDEM) || defined(__MINT__)
86 while (ret < (long)bufsize)
88 ! wlen = vim_write(fd, buf + ret, bufsize - ret);
94 while (ret < (long)bufsize)
96 ! wlen = vim_write(fd, (char *)buf + ret, bufsize - ret);
100 *** ../vim-7.3.084/src/if_cscope.c 2010-09-21 16:56:29.000000000 +0200
101 --- src/if_cscope.c 2010-12-17 17:47:02.000000000 +0100
104 #include <sys/stat.h>
106 # include <sys/wait.h>
108 - /* not UNIX, must be WIN32 */
109 - # include "vimio.h"
111 #include "if_cscope.h"
114 *** ../vim-7.3.084/src/if_sniff.c 2010-08-15 21:57:25.000000000 +0200
115 --- src/if_sniff.c 2010-12-17 17:47:20.000000000 +0100
121 - # include "vimio.h"
122 # include <process.h>
126 *** ../vim-7.3.084/src/main.c 2010-11-16 16:25:46.000000000 +0100
127 --- src/main.c 2010-12-17 17:47:41.000000000 +0100
130 * See README.txt for an overview of the Vim source code.
133 - #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
134 - # include "vimio.h" /* for close() and dup() */
141 *** ../vim-7.3.084/src/memfile.c 2010-12-17 16:27:10.000000000 +0100
142 --- src/memfile.c 2010-12-17 17:47:54.000000000 +0100
148 - #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
149 - # include "vimio.h" /* for lseek(), must be before vim.h */
156 *** ../vim-7.3.084/src/memline.c 2010-12-17 16:27:10.000000000 +0100
157 --- src/memline.c 2010-12-17 17:48:06.000000000 +0100
163 - #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
164 - # include "vimio.h" /* for mch_open(), must be before vim.h */
169 #ifndef UNIX /* it's in os_unix.h for Unix */
171 *** ../vim-7.3.084/src/netbeans.c 2010-12-17 12:19:14.000000000 +0100
172 --- src/netbeans.c 2010-12-17 17:48:19.000000000 +0100
175 * See ":help netbeans-protocol" for explanation.
178 - #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
179 - # include "vimio.h" /* for mch_open(), must be before vim.h */
184 #if defined(FEAT_NETBEANS_INTG) || defined(PROTO)
186 *** ../vim-7.3.084/src/os_msdos.c 2010-08-15 21:57:25.000000000 +0200
187 --- src/os_msdos.c 2010-12-17 17:48:40.000000000 +0100
190 * Some functions are also used for Win16 (MS-Windows 3.1).
198 *** ../vim-7.3.084/src/os_mswin.c 2010-10-23 14:02:48.000000000 +0200
199 --- src/os_mswin.c 2010-12-17 17:48:51.000000000 +0100
210 *** ../vim-7.3.084/src/os_win16.c 2010-08-15 21:57:32.000000000 +0200
211 --- src/os_win16.c 2010-12-17 17:49:02.000000000 +0100
222 *** ../vim-7.3.084/src/os_win32.c 2010-11-24 12:35:14.000000000 +0100
223 --- src/os_win32.c 2010-12-17 17:49:11.000000000 +0100
226 * Roger Knobbe <rogerk@wonderware.com> did the initial port of Vim 3.0.
234 *** ../vim-7.3.084/src/spell.c 2010-12-08 17:09:27.000000000 +0100
235 --- src/spell.c 2010-12-17 17:49:24.000000000 +0100
238 * few bytes as possible, see offset2bytes())
241 - #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
242 - # include "vimio.h" /* for lseek(), must be before vim.h */
247 #if defined(FEAT_SPELL) || defined(PROTO)
249 *** ../vim-7.3.084/src/tag.c 2010-09-21 16:56:29.000000000 +0200
250 --- src/tag.c 2010-12-17 17:49:35.000000000 +0100
253 * Code to handle tags and the tag stack
256 - #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
257 - # include "vimio.h" /* for lseek(), must be before vim.h */
264 *** ../vim-7.3.084/src/undo.c 2010-12-17 16:27:10.000000000 +0100
265 --- src/undo.c 2010-12-17 17:49:59.000000000 +0100
268 #define UH_MAGIC 0x18dade /* value for uh_magic when in use */
269 #define UE_MAGIC 0xabc123 /* value for ue_magic when in use */
271 - #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
272 - # include "vimio.h" /* for vim_read(), must be before vim.h */
277 static void u_unch_branch __ARGS((u_header_T *uhp));
279 *** ../vim-7.3.084/src/vim.h 2010-12-17 16:27:10.000000000 +0100
280 --- src/vim.h 2010-12-17 17:51:43.000000000 +0100
287 + #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64) \
288 + || defined(__EMX__)
289 + # include "vimio.h"
292 /* ============ the header file puzzle (ca. 50-100 pieces) ========= */
294 #ifdef HAVE_CONFIG_H /* GNU autoconf (or something else) was here */
295 *** ../vim-7.3.084/src/version.c 2010-12-17 17:35:05.000000000 +0100
296 --- src/version.c 2010-12-17 17:55:39.000000000 +0100
300 { /* Add new patch number below this line */
306 How To Keep A Healthy Level Of Insanity:
307 14. Put mosquito netting around your work area. Play a tape of jungle
310 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
311 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
312 \\\ an exciting new programming language -- http://www.Zimbu.org ///
313 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///