diff options
author | ShadowNinja <shadowninja@minetest.net> | 2014-09-11 18:22:05 -0400 |
---|---|---|
committer | ShadowNinja <shadowninja@minetest.net> | 2014-09-21 14:39:35 -0400 |
commit | 6bc4cad0eddd7a7cf593ca1471599e2d75727379 (patch) | |
tree | d05d5f039648d18f49fc0cf56132b2e9a5c88e09 /src/socket.cpp | |
parent | 2ae5d3f3abc7ac5ee96c4dfc7eeead045fdc775e (diff) | |
download | minetest-6bc4cad0eddd7a7cf593ca1471599e2d75727379.tar.gz minetest-6bc4cad0eddd7a7cf593ca1471599e2d75727379.tar.bz2 minetest-6bc4cad0eddd7a7cf593ca1471599e2d75727379.zip |
Split settings into seperate source and header files
This also cleans up settings a bit
Diffstat (limited to 'src/socket.cpp')
-rw-r--r-- | src/socket.cpp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/socket.cpp b/src/socket.cpp index 508d61a31..0e9183f18 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -19,6 +19,21 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "socket.h" +#include <stdio.h> +#include <iostream> +#include <stdlib.h> +#include <string.h> +#include <errno.h> +#include <sstream> +#include <iomanip> +#include "util/string.h" +#include "util/numeric.h" +#include "constants.h" +#include "debug.h" +#include "settings.h" +#include "log.h" +#include "main.h" // for g_settings + #ifdef _WIN32 #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN @@ -46,20 +61,6 @@ typedef int socklen_t; typedef int socket_t; #endif -#include "constants.h" -#include "debug.h" -#include "settings.h" -#include "main.h" // for g_settings -#include <stdio.h> -#include <iostream> -#include <stdlib.h> -#include <string.h> -#include <errno.h> -#include <sstream> -#include <iomanip> -#include "util/string.h" -#include "util/numeric.h" - // Set to true to enable verbose debug output bool socket_enable_debug_output = false; |