| 1 | diff -u -r ../gawk-4.1.0/extension/stack.c ./extension/stack.c |
| 2 | --- ../gawk-4.1.0/extension/stack.c 2013-05-02 21:51:30.000000000 +0200 |
| 3 | +++ ./extension/stack.c 2014-02-12 16:54:08.000000000 +0100 |
| 4 | @@ -31,14 +31,14 @@ |
| 5 | |
| 6 | static size_t size; |
| 7 | static void **stack; |
| 8 | -static int index = -1; |
| 9 | +static int stack_index = -1; |
| 10 | |
| 11 | /* stack_empty --- return true if stack is empty */ |
| 12 | |
| 13 | int |
| 14 | stack_empty() |
| 15 | { |
| 16 | - return index < 0; |
| 17 | + return stack_index < 0; |
| 18 | } |
| 19 | |
| 20 | /* stack_top --- return top object on the stack */ |
| 21 | @@ -49,7 +49,7 @@ |
| 22 | if (stack_empty() || stack == NULL) |
| 23 | return NULL; |
| 24 | |
| 25 | - return stack[index]; |
| 26 | + return stack[stack_index]; |
| 27 | } |
| 28 | |
| 29 | /* stack_pop --- pop top object and return it */ |
| 30 | @@ -60,7 +60,7 @@ |
| 31 | if (stack_empty() || stack == NULL) |
| 32 | return NULL; |
| 33 | |
| 34 | - return stack[index--]; |
| 35 | + return stack[stack_index--]; |
| 36 | } |
| 37 | |
| 38 | /* stack_push --- push an object onto the stack */ |
| 39 | @@ -75,7 +75,7 @@ |
| 40 | if (stack == NULL) |
| 41 | return 0; |
| 42 | size = INITIAL_STACK; |
| 43 | - } else if (index + 1 >= size) { |
| 44 | + } else if (stack_index + 1 >= size) { |
| 45 | if (new_size < size) |
| 46 | return 0; |
| 47 | new_stack = realloc(stack, new_size * sizeof(void *)); |
| 48 | @@ -85,6 +85,6 @@ |
| 49 | stack = new_stack; |
| 50 | } |
| 51 | |
| 52 | - stack[++index] = object; |
| 53 | + stack[++stack_index] = object; |
| 54 | return 1; |
| 55 | } |