Browse code

- beatifications (preparing to reuse it in aaa diameter)

Andrei Pelinescu-Onciul authored on 12/03/2003 15:55:12
Showing 2 changed files
... ...
@@ -161,13 +161,7 @@ int shm_mem_init()
161 161
 	}
162 162
 
163 163
 	/* init it for malloc*/
164
-#	ifdef VQ_MALLOC
165
-		shm_block=vqm_malloc_init(shm_mempool, /* SHM_MEM_SIZE */ shm_mem_size );
166
-	#elif defined F_MALLOC
167
-		shm_block=fm_malloc_init(shm_mempool, /* SHM_MEM_SIZE */ shm_mem_size );
168
-#	else
169
-		shm_block=qm_malloc_init(shm_mempool, /* SHM_MEM_SIZE */ shm_mem_size );
170
-#	endif
164
+	shm_block=shm_malloc_init(shm_mempool, shm_mem_size);
171 165
 	if (shm_block==0){
172 166
 		LOG(L_CRIT, "ERROR: shm_mem_init: could not initialize shared"
173 167
 				" malloc\n");
... ...
@@ -58,18 +58,21 @@
58 58
 #	define MY_MALLOC vqm_malloc
59 59
 #	define MY_FREE vqm_free
60 60
 #	define MY_STATUS vqm_status
61
+#	define  shm_malloc_init vqm_malloc_init
61 62
 #elif defined F_MALLOC
62 63
 #	include "f_malloc.h"
63 64
 	extern struct fm_block* shm_block;
64 65
 #	define MY_MALLOC fm_malloc
65 66
 #	define MY_FREE fm_free
66 67
 #	define MY_STATUS fm_status
68
+#	define  shm_malloc_init fm_malloc_init
67 69
 #else
68 70
 #	include "q_malloc.h"
69 71
 	extern struct qm_block* shm_block;
70 72
 #	define MY_MALLOC qm_malloc
71 73
 #	define MY_FREE qm_free
72 74
 #	define MY_STATUS qm_status
75
+#	define  shm_malloc_init qm_malloc_init
73 76
 #endif
74 77
 
75 78