]>
Commit | Line | Data |
---|---|---|
d8621708 | 1 | To: vim-dev@vim.org |
2 | Subject: Patch 6.2.030 | |
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.030 | |
11 | Problem: Mac: Warning for not being able to use precompiled header files. | |
12 | Solution: Don't redefine select. Use -no-cpp-precomp for compiling, so that | |
13 | function prototypes are still found. | |
14 | Files: src/os_unix.c, src/osdef.sh | |
15 | ||
16 | ||
17 | *** ../vim-6.2.029/src/os_unix.c Thu Jul 24 21:29:03 2003 | |
18 | --- src/os_unix.c Thu Jul 24 21:25:57 2003 | |
19 | *************** | |
20 | *** 22,29 **** | |
21 | * Some systems have a prototype for select() that has (int *) instead of | |
22 | * (fd_set *), which is wrong. This define removes that prototype. We define | |
23 | * our own prototype below. | |
24 | */ | |
25 | ! #define select select_declared_wrong | |
26 | ||
27 | #include "vim.h" | |
28 | ||
29 | --- 22,33 ---- | |
30 | * Some systems have a prototype for select() that has (int *) instead of | |
31 | * (fd_set *), which is wrong. This define removes that prototype. We define | |
32 | * our own prototype below. | |
33 | + * Don't use it for the Mac, it causes a warning for precompiled headers. | |
34 | + * TODO: use a configure check for precompiled headers? | |
35 | */ | |
36 | ! #ifndef __APPLE__ | |
37 | ! # define select select_declared_wrong | |
38 | ! #endif | |
39 | ||
40 | #include "vim.h" | |
41 | ||
42 | *** ../vim-6.2.029/src/osdef.sh Tue Apr 9 20:28:37 2002 | |
43 | --- src/osdef.sh Thu Jul 24 22:00:06 2003 | |
44 | *************** | |
45 | *** 21,27 **** | |
46 | rm -f core* *.core | |
47 | ||
48 | cat << EOF > osdef0.c | |
49 | ! #define select select_declared_wrong | |
50 | #define tgetstr tgetstr_declared_wrong | |
51 | #include "auto/config.h" | |
52 | #include "os_unix.h" /* bring in most header files, more follow below */ | |
53 | --- 21,29 ---- | |
54 | rm -f core* *.core | |
55 | ||
56 | cat << EOF > osdef0.c | |
57 | ! #ifndef __APPLE__ | |
58 | ! # define select select_declared_wrong | |
59 | ! #endif | |
60 | #define tgetstr tgetstr_declared_wrong | |
61 | #include "auto/config.h" | |
62 | #include "os_unix.h" /* bring in most header files, more follow below */ | |
63 | *************** | |
64 | *** 41,47 **** | |
65 | #endif | |
66 | EOF | |
67 | ||
68 | ! $CC -I. -I$srcdir -E osdef0.c >osdef0.cc | |
69 | ||
70 | # insert a space in front of each line, so that a function name at the | |
71 | # start of the line is matched with "[)*, ]\1[ (]" | |
72 | --- 43,53 ---- | |
73 | #endif | |
74 | EOF | |
75 | ||
76 | ! # Mac uses precompiled headers, but we need real headers here. | |
77 | ! case `uname` in | |
78 | ! Darwin) $CC -I. -I$srcdir -E -no-cpp-precomp osdef0.c >osdef0.cc;; | |
79 | ! *) $CC -I. -I$srcdir -E osdef0.c >osdef0.cc;; | |
80 | ! esac | |
81 | ||
82 | # insert a space in front of each line, so that a function name at the | |
83 | # start of the line is matched with "[)*, ]\1[ (]" | |
84 | *** ../vim-6.2.029/src/version.c Thu Jul 24 21:52:31 2003 | |
85 | --- src/version.c Thu Jul 24 22:05:54 2003 | |
86 | *************** | |
87 | *** 632,633 **** | |
88 | --- 632,635 ---- | |
89 | { /* Add new patch number below this line */ | |
90 | + /**/ | |
91 | + 30, | |
92 | /**/ | |
93 | ||
94 | -- | |
95 | SUPERIMPOSE "England AD 787". After a few more seconds we hear hoofbeats in | |
96 | the distance. They come slowly closer. Then out of the mist comes KING | |
97 | ARTHUR followed by a SERVANT who is banging two half coconuts together. | |
98 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
99 | ||
100 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
101 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
102 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
103 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |