Fixed expantion of shm_info() for HP_MALLOC

Reported by Nick Altmann Closes #1240 (cherry picked from commit cec2d66)
OpenSIPS · Jan 5, 2018 · 57065ca · 57065ca
1 parent 6954ffd
commit 57065ca
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/mem/shm_mem.h b/mem/shm_mem.h
@@ -616,12 +616,16 @@ inline static void shm_status(void)
 }
 
 
-#define shm_info(mi) \
-do{\
-	shm_lock(); \
-	MY_MEMINFO(shm_block, mi); \
-	shm_unlock(); \
-}while(0)
+inline static void shm_info(struct mem_info* mi)
+{
+#ifndef HP_MALLOC
+	shm_lock();
+#endif
+	MY_MEMINFO(shm_block, mi);
+#ifndef HP_MALLOC
+	shm_unlock();
+#endif
+}
 
 /*
  * performs a full shared memory pool scan for any corruptions or inconsistencies