Merge remote branch 'origin/master'

[minetest.git] / src / socket.cpp

diff --git a/src/socket.cpp b/src/socket.cpp
index caf1895fe6037596e3d570f768868b89b48fb711..9e289baa2c5f6c2412e63fb422388a01e3d7deec 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -50,7 +50,8 @@ typedef int socket_t;
 #include <iostream>
 #include <stdlib.h>
 #include <errno.h>
-#include "utility.h"
+#include "util/string.h"
+#include "util/numeric.h"
 
 bool socket_enable_debug_output = false;
 #define DP socket_enable_debug_output