2 Subject: Patch 6.2.057 (extra)
4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=ISO-8859-1
7 Content-Transfer-Encoding: 8bit
11 Problem: Mac: With -DMACOS_X putenv() is defined twice, it is in a system
12 library. Get a warning for redefining OK. Unused variables in
14 Solution: Define HAVE_PUTENV. Undefine OK after including curses.h.
15 Remove declarations for unused variables.
16 Files: src/os_mac.c, src/os_mac.h, src/vim.h
19 *** ../vim-6.2.056/src/os_mac.c Sat Apr 19 15:11:45 2003
20 --- src/os_mac.c Mon Jul 28 14:37:52 2003
24 #ifdef USE_UNIXFILENAME
30 UInt32 pathSize = STRLEN(name) + 1;
39 ! status=FSPathMakeRef ( (UInt8 *) name, &refFile, &isDirectory);
43 ! status=FSRefMakePath (&refFile, (UInt8 *) path, pathSize);
47 /* Paranoid: Update the name if only the casing differ.*/
48 if (STRICMP(name, path) == 0)
49 ! STRCPY (name, path);
52 static char_u *oldtitle = (char_u *) "gVim";
57 ! status = FSPathMakeRef((UInt8 *)name, &refFile, &isDirectory);
61 ! status = FSRefMakePath(&refFile, (UInt8 *)path, pathSize);
65 /* Paranoid: Update the name if only the casing differ.*/
66 if (STRICMP(name, path) == 0)
70 static char_u *oldtitle = (char_u *) "gVim";
76 - static int curr_tmode = TMODE_COOK; /* contains current terminal mode */
81 *** ../vim-6.2.056/src/os_mac.h Fri Jul 25 22:30:18 2003
82 --- src/os_mac.h Mon Jul 28 14:24:31 2003
89 + /* OK defined to 0 in MacOS X 10.2 curses! Remove it, we define it to be 1. */
99 # define mch_chdir(s) chdir(s)
103 + # define HAVE_PUTENV
106 /* A Mac constant causing big problem to syntax highlighting */
107 *** ../vim-6.2.056/src/vim.h Thu May 29 11:32:47 2003
108 --- src/vim.h Mon Jul 28 14:23:47 2003
111 /* return values for functions */
112 #if !(defined(OK) && (OK == 1))
113 /* OK already defined to 1 in MacOS X curses, skip this */
114 - /* OK defined to 0 in MacOS X 10.2 curses! redefine it */
115 - # if defined(OK) && defined(MACOS_X_UNIX)
122 *** ../vim-6.2.056/src/version.c Sun Jul 27 15:09:30 2003
123 --- src/version.c Mon Jul 28 14:36:14 2003
127 { /* Add new patch number below this line */
133 An easy way to determine if you have enough teamwork to be doomed is simply to
134 measure how long it takes from the time you decide to go to lunch together
135 until the time you actually eat.
136 (Scott Adams - The Dilbert principle)
138 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
139 /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\
140 \\\ Project leader for A-A-P -- http://www.A-A-P.org ///
141 \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///