diff options
| author | sapier <Sapier at GMX dot net> | 2014-06-01 14:54:21 +0200 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2014-06-01 14:54:21 +0200 |
| commit | 32ab6c2a32ff4336edca87d58efe2e6fa7df6c48 (patch) | |
| tree | a59d14f8f3010363faf596cb0acdfddd5d105ac0 /src/main.cpp | |
| parent | 75ddf4d221301bea206311df4834903c64c566c1 (diff) | |
| download | minetest-32ab6c2a32ff4336edca87d58efe2e6fa7df6c48.tar.gz minetest-32ab6c2a32ff4336edca87d58efe2e6fa7df6c48.tar.bz2 minetest-32ab6c2a32ff4336edca87d58efe2e6fa7df6c48.zip | |
Revert "Add daemon support for linux like operating systems"
Remove daemon support due to delayed popular vote (part 2)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/main.cpp b/src/main.cpp index 43284611f..0531a8540 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -811,9 +811,6 @@ int main(int argc, char *argv[]) _("Set password")))); allowed_options.insert(std::make_pair("go", ValueSpec(VALUETYPE_FLAG, _("Disable main menu")))); -#else - allowed_options.insert(std::make_pair("daemon", ValueSpec(VALUETYPE_FLAG, - _("Daemonize minetestserver")))); #endif Settings cmd_args; @@ -921,12 +918,6 @@ int main(int argc, char *argv[]) <<", "<<minetest_build_info <<std::endl; -#ifdef SERVER - if (cmd_args.exists("daemon")) { - porting::daemonize(); - } -#endif - /* Basic initialization */ @@ -1478,7 +1469,7 @@ int main(int argc, char *argv[]) ELL_ERROR, ELL_WARNING, ELL_INFORMATION, -#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8) +#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8) ELL_INFORMATION #else ELL_DEBUG @@ -1929,14 +1920,6 @@ int main(int argc, char *argv[]) debugstreams_deinit(); - -#ifdef SERVER - if (cmd_args.exists("daemon")) - { - porting::cleanup_pid(); - } -#endif - return retval; } |