diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-05-31 17:48:12 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-06-01 00:48:46 +0000 |
| commit | 437477ce08f222c8e00814daff6dfc1ee6add8a2 (patch) | |
| tree | 3a3ad3076722685485eb44af940092f5a47b89b6 /epan/nghttp2 | |
| parent | d67e305c49c632a9c9feb9c38a29c3066a2a6954 (diff) | |
Change the declaration of nghttp2_mem_free2() to match the definition.
The free routine pointer was renamed to free_func to avoid collisions
with the standard C free() function.
From Jeff Morris' abandoned change Ia3810fe228b497d888d825f8b606078e2f71be65.
Change-Id: Iedeb74625b13d1097da510487b60f38861a42bec
Reviewed-on: https://code.wireshark.org/review/15666
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/nghttp2')
| -rw-r--r-- | epan/nghttp2/nghttp2_mem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/nghttp2/nghttp2_mem.h b/epan/nghttp2/nghttp2_mem.h index 55b187e8e1..872a6e1d85 100644 --- a/epan/nghttp2/nghttp2_mem.h +++ b/epan/nghttp2/nghttp2_mem.h @@ -38,7 +38,7 @@ nghttp2_mem *nghttp2_mem_default(void); |mem|. */ void *nghttp2_mem_malloc(nghttp2_mem *mem, size_t size); void nghttp2_mem_free(nghttp2_mem *mem, void *ptr); -void nghttp2_mem_free2(nghttp2_free free, void *ptr, void *mem_user_data); +void nghttp2_mem_free2(nghttp2_free free_func, void *ptr, void *mem_user_data); void *nghttp2_mem_calloc(nghttp2_mem *mem, size_t nmemb, size_t size); void *nghttp2_mem_realloc(nghttp2_mem *mem, void *ptr, size_t size); |