From 695953440565103964e816e7326c66f3d171c3e0 Mon Sep 17 00:00:00 2001
From: jimi-wzq <wangzhengquan85@gmail.com>
Date: 星期六, 01 八月 2020 10:48:18 +0800
Subject: [PATCH] fix conflict
---
src/queue/shm_mm.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/queue/shm_mm.c b/src/queue/shm_mm.c
index 6eeae1a..c5009a9 100644
--- a/src/queue/shm_mm.c
+++ b/src/queue/shm_mm.c
@@ -10,4 +10,7 @@
mem_pool_destroy();
}
-
+int shm_alloc_key() {
+ hashtable_t *hashtable = mm_get_hashtable();
+ return hashtable_alloc_key(hashtable);
+}
--
Gitblit v1.8.0