From e85c28ce148e0740697c76e9751b0d9cacbe67d1 Mon Sep 17 00:00:00 2001 From: blacksirius Date: Sun, 10 Jun 2012 16:04:24 +0000 Subject: - added some missing copyrights - merged (bs-coreoptimize->trunk) generic athena style configuration parser (raconf) - merged (bs-coreoptimize->trunk) threadsafe memory pool (mempool) [i need it for the new 'socket' system] - set svn:eol-style property on newer files were it was missing git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16263 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/common/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/common/core.c') diff --git a/src/common/core.c b/src/common/core.c index 4e276fcdc..2923b4de7 100644 --- a/src/common/core.c +++ b/src/common/core.c @@ -10,6 +10,7 @@ #include "../common/socket.h" #include "../common/timer.h" #include "../common/thread.h" +#include "../common/mempool.h" #endif #include @@ -280,7 +281,7 @@ int main (int argc, char **argv) usercheck(); rathread_init(); - + mempool_init(); db_init(); signals_init(); @@ -306,7 +307,7 @@ int main (int argc, char **argv) timer_final(); socket_final(); db_final(); - + mempool_final(); rathread_final(); #endif -- cgit v1.2.3-60-g2f50