| author | Danek Duvall <danek.duvall@oracle.com> |
| Mon, 26 Sep 2016 21:06:11 -0700 | |
| changeset 7049 | e8d705cba87d |
| parent 5238 | ac8017f29145 |
| permissions | -rw-r--r-- |
|
5238
ac8017f29145
22505430 need workaround for build failure due to new si_id #define
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
1 |
A change to sys/siginfo.h added a #define for si_id that breaks the vim |
|
ac8017f29145
22505430 need workaround for build failure due to new si_id #define
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
2 |
build. This is a nasty hack to undo those effects, and should not go |
|
ac8017f29145
22505430 need workaround for build failure due to new si_id #define
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
3 |
upstream. The right fix may be to get vim to stop using the "si_" prefix, |
|
ac8017f29145
22505430 need workaround for build failure due to new si_id #define
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
4 |
since that appears to be "reserved for the implementation", per the |
|
ac8017f29145
22505430 need workaround for build failure due to new si_id #define
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
5 |
OpenGroup specs. |
|
ac8017f29145
22505430 need workaround for build failure due to new si_id #define
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
6 |
|
|
7049
e8d705cba87d
24676533 vim 8.0.0016
Danek Duvall <danek.duvall@oracle.com>
parents:
5238
diff
changeset
|
7 |
--- a/src/syntax.c Sat Aug 10 06:00:24 2013 |
|
e8d705cba87d
24676533 vim 8.0.0016
Danek Duvall <danek.duvall@oracle.com>
parents:
5238
diff
changeset
|
8 |
+++ b/src/syntax.c Wed Jan 6 10:34:12 2016 |
|
e8d705cba87d
24676533 vim 8.0.0016
Danek Duvall <danek.duvall@oracle.com>
parents:
5238
diff
changeset
|
9 |
@@ -283,6 +283,7 @@ |
|
5238
ac8017f29145
22505430 need workaround for build failure due to new si_id #define
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
10 |
* When si_m_endpos.lnum is 0, the items other than si_idx are unknown. |
|
ac8017f29145
22505430 need workaround for build failure due to new si_id #define
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
11 |
* (The end positions have the column number of the next char) |
|
ac8017f29145
22505430 need workaround for build failure due to new si_id #define
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
12 |
*/ |
|
ac8017f29145
22505430 need workaround for build failure due to new si_id #define
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
13 |
+#undef si_id |
|
ac8017f29145
22505430 need workaround for build failure due to new si_id #define
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
14 |
typedef struct state_item |
|
ac8017f29145
22505430 need workaround for build failure due to new si_id #define
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
15 |
{
|
|
ac8017f29145
22505430 need workaround for build failure due to new si_id #define
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
16 |
int si_idx; /* index of syntax pattern or |