diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-05-20 13:55:21 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-05-20 13:55:21 +0200 |
| commit | d590d6ba149f6d8483f93bd8ba6c821c9dd6a4af (patch) | |
| tree | 69412c0f0eb3e03d07f7e29d40cd68f86805206d | |
| parent | ca9b6a7551729588d2a9c24b49b3a28270876206 (diff) | |
| download | vim-d590d6ba149f6d8483f93bd8ba6c821c9dd6a4af.tar.gz | |
Problem: Can't build on HP-UX.
Solution: Remove modern initialization. (John Marriott)
| -rw-r--r-- | src/regexp_nfa.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index eea17381..cb418887 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -1961,14 +1961,17 @@ static void st_push __ARGS((Frag_T s, Frag_T **p, Frag_T *stack_end)); static Frag_T st_pop __ARGS((Frag_T **p, Frag_T *stack)); /* - * Initialize Frag_T struct. + * Initialize a Frag_T struct and return it. */ static Frag_T frag(start, out) nfa_state_T *start; Ptrlist *out; { - Frag_T n = { start, out }; + Frag_T n; + + n.start = start; + n.out = out; return n; } @@ -2144,7 +2147,7 @@ post2nfa(postfix, end, nfa_calc_size) if (postfix == NULL) return NULL; -#define PUSH(s) st_push ((s), &stackp, stack_end) +#define PUSH(s) st_push((s), &stackp, stack_end) #define POP() st_pop(&stackp, stack); \ if (stackp < stack) \ { \ diff --git a/src/version.c b/src/version.c index 6f07a041..933cf911 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 976, +/**/ 975, /**/ 974, |