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/include/shm_mm.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/queue/include/shm_mm.h b/src/queue/include/shm_mm.h
index 8aeb202..ec094ac 100644
--- a/src/queue/include/shm_mm.h
+++ b/src/queue/include/shm_mm.h
@@ -18,6 +18,8 @@
  */
 void shm_destroy();
 
+int shm_alloc_key();
+
 
 #ifdef __cplusplus
 }

--
Gitblit v1.8.0