aboutsummaryrefslogtreecommitdiffstats
path: root/epan/nghttp2/nghttp2_mem.c
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-05-26 23:05:33 +0200
committerPascal Quantin <pascal.quantin@gmail.com>2016-05-31 07:18:25 +0000
commit68903e7b934ddeb909899ac7aa1249adfed69d8f (patch)
tree216c50d862b914929e787d49747504ad21fbcf7c /epan/nghttp2/nghttp2_mem.c
parent7723ed6494498726feafe47858038d569cc82203 (diff)
Update to nghttp2 1.11.1
Change-Id: I308b4db02b1501f38b2693b45b2b9bd6054376d1 Reviewed-on: https://code.wireshark.org/review/15579 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/nghttp2/nghttp2_mem.c')
-rw-r--r--epan/nghttp2/nghttp2_mem.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/nghttp2/nghttp2_mem.c b/epan/nghttp2/nghttp2_mem.c
index e7d5aae3b8..317363a70d 100644
--- a/epan/nghttp2/nghttp2_mem.c
+++ b/epan/nghttp2/nghttp2_mem.c
@@ -52,6 +52,10 @@ void nghttp2_mem_free(nghttp2_mem *mem, void *ptr) {
mem->free(ptr, mem->mem_user_data);
}
+void nghttp2_mem_free2(nghttp2_free free, void *ptr, void *mem_user_data) {
+ free(ptr, mem_user_data);
+}
+
void *nghttp2_mem_calloc(nghttp2_mem *mem, size_t nmemb, size_t size) {
return mem->calloc(nmemb, size, mem->mem_user_data);
}