diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-07-06 08:33:07 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-07-06 08:33:07 +0000 |
| commit | 24142c4ee45d7d2c42c39f78003b88e7302dc16f (patch) | |
| tree | d3dcb54942beb2fd4af99eb75b0e8dd0c91d383d /epan/wmem/wmem_array.c | |
| parent | 3376be17a75d5989957d434663a2fc449d20f9c2 (diff) | |
| download | wireshark-24142c4ee45d7d2c42c39f78003b88e7302dc16f.tar.gz | |
In some versions of some OSes, even <string.h> declares index() under
some circumstances. Use array_index as a variable name instead, to
avoid warnings.
svn path=/trunk/; revision=50404
Diffstat (limited to 'epan/wmem/wmem_array.c')
| -rw-r--r-- | epan/wmem/wmem_array.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/wmem/wmem_array.c b/epan/wmem/wmem_array.c index da0a034e06..7c03c2501e 100644 --- a/epan/wmem/wmem_array.c +++ b/epan/wmem/wmem_array.c @@ -111,10 +111,10 @@ wmem_array_append(wmem_array_t *array, const void *in, guint count) } void * -wmem_array_index(wmem_array_t *array, guint index) +wmem_array_index(wmem_array_t *array, guint array_index) { - g_assert(index < array->elem_count); - return &array->buf[index * array->elem_size]; + g_assert(array_index < array->elem_count); + return &array->buf[array_index * array->elem_size]; } void * |