]>
Commit | Line | Data |
---|---|---|
d8621708 | 1 | To: vim-dev@vim.org |
2 | Subject: Patch 6.2.057 (extra) | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 6.2.057 (extra) | |
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 | |
13 | os_mac.c | |
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 | |
17 | ||
18 | ||
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 | |
21 | *************** | |
22 | *** 490,499 **** | |
23 | */ | |
24 | #ifdef USE_UNIXFILENAME | |
25 | OSStatus status; | |
26 | - OSErr error; | |
27 | FSRef refFile; | |
28 | - FSRef refParent; | |
29 | - FSSpec specFile; | |
30 | UInt32 pathSize = STRLEN(name) + 1; | |
31 | char_u *path; | |
32 | Boolean isDirectory; | |
33 | --- 490,496 ---- | |
34 | *************** | |
35 | *** 502,518 **** | |
36 | if (path == NULL) | |
37 | return; | |
38 | ||
39 | ! status=FSPathMakeRef ( (UInt8 *) name, &refFile, &isDirectory); | |
40 | if (status) | |
41 | return; | |
42 | ||
43 | ! status=FSRefMakePath (&refFile, (UInt8 *) path, pathSize); | |
44 | if (status) | |
45 | return; | |
46 | ||
47 | /* Paranoid: Update the name if only the casing differ.*/ | |
48 | if (STRICMP(name, path) == 0) | |
49 | ! STRCPY (name, path); | |
50 | #endif | |
51 | } | |
52 | static char_u *oldtitle = (char_u *) "gVim"; | |
53 | --- 499,515 ---- | |
54 | if (path == NULL) | |
55 | return; | |
56 | ||
57 | ! status = FSPathMakeRef((UInt8 *)name, &refFile, &isDirectory); | |
58 | if (status) | |
59 | return; | |
60 | ||
61 | ! status = FSRefMakePath(&refFile, (UInt8 *)path, pathSize); | |
62 | if (status) | |
63 | return; | |
64 | ||
65 | /* Paranoid: Update the name if only the casing differ.*/ | |
66 | if (STRICMP(name, path) == 0) | |
67 | ! STRCPY(name, path); | |
68 | #endif | |
69 | } | |
70 | static char_u *oldtitle = (char_u *) "gVim"; | |
71 | *************** | |
72 | *** 1150,1156 **** | |
73 | exit(r); | |
74 | } | |
75 | ||
76 | - static int curr_tmode = TMODE_COOK; /* contains current terminal mode */ | |
77 | ||
78 | void | |
79 | mch_settmode(tmode) | |
80 | --- 1147,1152 ---- | |
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 | |
83 | *************** | |
84 | *** 71,76 **** | |
85 | --- 71,78 ---- | |
86 | # include <curses.h> | |
87 | # undef reg | |
88 | # undef ospeed | |
89 | + /* OK defined to 0 in MacOS X 10.2 curses! Remove it, we define it to be 1. */ | |
90 | + # undef OK | |
91 | #endif | |
92 | #include <signal.h> | |
93 | #include <errno.h> | |
94 | *************** | |
95 | *** 375,380 **** | |
96 | --- 377,386 ---- | |
97 | # define HAVE_SETENV | |
98 | # define HAVE_RENAME | |
99 | # define mch_chdir(s) chdir(s) | |
100 | + #endif | |
101 | + | |
102 | + #ifdef MACOS_X | |
103 | + # define HAVE_PUTENV | |
104 | #endif | |
105 | ||
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 | |
109 | *************** | |
110 | *** 529,538 **** | |
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) | |
116 | - # undef OK | |
117 | - # endif | |
118 | # define OK 1 | |
119 | #endif | |
120 | #define FAIL 0 | |
121 | --- 529,534 ---- | |
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 | |
124 | *************** | |
125 | *** 632,633 **** | |
126 | --- 632,635 ---- | |
127 | { /* Add new patch number below this line */ | |
128 | + /**/ | |
129 | + 57, | |
130 | /**/ | |
131 | ||
132 | -- | |
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) | |
137 | ||
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 /// |