diff options
| author | Flipp <mysteriousragnarok@hotmail.com> | 2013-05-17 15:18:51 -0700 |
|---|---|---|
| committer | Flipp <mysteriousragnarok@hotmail.com> | 2013-05-17 15:18:51 -0700 |
| commit | b3bc657a44a9fbdd1730f569855e25ccd0f8dd01 (patch) | |
| tree | ba8dc9ee07be73d2cbb62e0a1f83d29d1fa6b7c8 /src/common/core.c | |
| parent | 4ef9258f0f618857ed5d9e2f9e07f33dc6d13559 (diff) | |
| parent | 9afe7f28d0e3f4c9bc3abba22d8055ae7dc46f45 (diff) | |
| download | hercules-b3bc657a44a9fbdd1730f569855e25ccd0f8dd01.tar.gz hercules-b3bc657a44a9fbdd1730f569855e25ccd0f8dd01.tar.bz2 hercules-b3bc657a44a9fbdd1730f569855e25ccd0f8dd01.tar.xz hercules-b3bc657a44a9fbdd1730f569855e25ccd0f8dd01.zip | |
Merge pull request #26 from Earisu/master
HPM Update
Diffstat (limited to 'src/common/core.c')
| -rw-r--r-- | src/common/core.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/common/core.c b/src/common/core.c index 984815bc2..0959e6fc9 100644 --- a/src/common/core.c +++ b/src/common/core.c @@ -284,9 +284,11 @@ void core_defaults(void) { #endif console_defaults(); strlib_defaults(); + malloc_defaults(); #ifndef MINICORE sql_defaults(); timer_defaults(); + db_defaults(); #endif } /*====================================== @@ -305,7 +307,7 @@ int main (int argc, char **argv) { } core_defaults(); - malloc_init();// needed for Show* in display_title() [FlavioJS] + malloclib->init();// needed for Show* in display_title() [FlavioJS] console->display_title(); @@ -320,7 +322,7 @@ int main (int argc, char **argv) { Sql_Init(); rathread_init(); mempool_init(); - db_init(); + DB->init(); signals_init(); #ifdef _WIN32 @@ -354,12 +356,12 @@ int main (int argc, char **argv) { #endif timer_final(); socket_final(); - db_final(); + DB->final(); mempool_final(); rathread_final(); #endif - malloc_final(); + malloclib->final(); return 0; } |