diff options
| author | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2012-09-19 17:15:30 +0400 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2012-09-19 17:15:30 +0400 |
| commit | 1bdd1f05773d1f16f4fc271e09a691a1750e0ed5 (patch) | |
| tree | a50d6e7dd162c7f6891f52269bd04b74f67fe5c2 /src/mem_pool.h | |
| parent | 9942bf2d277be84a322cdd3713cc51b8c6a1ec89 (diff) | |
| download | rspamd-1bdd1f05773d1f16f4fc271e09a691a1750e0ed5.tar.gz rspamd-1bdd1f05773d1f16f4fc271e09a691a1750e0ed5.zip | |
Use universal mutex type to avoid glib collisions.
Diffstat (limited to 'src/mem_pool.h')
| -rw-r--r-- | src/mem_pool.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mem_pool.h b/src/mem_pool.h index 79d9d48fe..5bef5fee1 100644 --- a/src/mem_pool.h +++ b/src/mem_pool.h @@ -70,6 +70,7 @@ struct _pool_destructors { /** * Memory pool type */ +struct rspamd_mutex_s; typedef struct memory_pool_s { struct _pool_chain *cur_pool; /**< currently used page */ struct _pool_chain *first_pool; /**< first page */ @@ -78,11 +79,7 @@ typedef struct memory_pool_s { struct _pool_chain_shared *shared_pool; /**< shared chain */ struct _pool_destructors *destructors; /**< destructors chain */ GHashTable *variables; /**< private memory pool variables */ -#if ((GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION <= 30)) - GStaticMutex mtx; /**< threads lock */ -#else - GMutex mtx; /**< threads lock */ -#endif + struct rspamd_mutex_s *mtx; /**< threads lock */ } memory_pool_t; /** |