Created
August 8, 2012 18:12
-
-
Save hasufell/3297190 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- src/stdafx.cpp.old 2009-09-02 12:08:57.000000000 +0200 | |
+++ src/stdafx.cpp 2012-08-08 14:27:48.000000000 +0200 | |
@@ -25,6 +25,7 @@ | |
*/ | |
#include "stdafx.h" | |
+#include <stdio.h> | |
namespace TA3D | |
{ | |
--- src/3dmeditor.cpp.old 2009-09-02 12:08:57.000000000 +0200 | |
+++ src/3dmeditor.cpp 2012-08-08 18:04:09.000000000 +0200 | |
@@ -15,6 +15,8 @@ | |
along with this program; if not, write to the Free Software | |
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA*/ | |
+#include <cstring> | |
+ | |
#include "stdafx.h" | |
#include "TA3D_NameSpace.h" | |
#include "threads/cThread.h" | |
@@ -1075,7 +1077,7 @@ | |
if (painter_area.get_state("paint.b_resolution")) // Change the texture size | |
{ | |
String new_res = GetVal( I18N::Translate( "New texture resolution" ) ); | |
- char *new_separator = strstr(new_res.c_str(),"x"); | |
+ char *new_separator = const_cast<char *>(strstr(new_res.c_str(),"x")); | |
if (new_separator) | |
{ | |
*new_separator=0; | |
--- src/fbi.cpp.old 2009-09-02 12:08:57.000000000 +0200 | |
+++ src/fbi.cpp 2012-08-08 18:47:10.000000000 +0200 | |
@@ -312,7 +312,7 @@ | |
for (String::List::iterator file = file_list.begin(); file != file_list.end(); ++file) // Cherche un fichier pouvant contenir des informations sur l'unité unit_name | |
{ | |
- char *f = NULL; | |
+ const char *f = NULL; | |
for (int i = 0; i < nb_unit; ++i) | |
{ | |
String fileUp = String::ToUpper(*file); | |
--- src/network/networkutils.cpp.old 2009-09-02 12:08:57.000000000 +0200 | |
+++ src/network/networkutils.cpp 2012-08-08 18:44:11.000000000 +0200 | |
@@ -1,3 +1,4 @@ | |
+#include <cstdio> | |
#include "network.h" | |
#include "../threads/thread.h" | |
#include "networkutils.h" | |
--- src/network/ta3dsock.cpp.old 2009-09-02 12:08:57.000000000 +0200 | |
+++ src/network/ta3dsock.cpp 2012-08-08 18:42:25.000000000 +0200 | |
@@ -15,6 +15,7 @@ | |
along with this program; if not, write to the Free Software | |
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA*/ | |
+#include <stdio.h> | |
#include "../stdafx.h" | |
#include "../TA3D_NameSpace.h" | |
#include "../misc/math.h" | |
--- src/network/udpsock.cpp.old 2009-09-02 12:08:57.000000000 +0200 | |
+++ src/network/udpsock.cpp 2012-08-08 18:41:58.000000000 +0200 | |
@@ -15,6 +15,7 @@ | |
along with this program; if not, write to the Free Software | |
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA*/ | |
+#include <stdio.h> | |
#include "../stdafx.h" | |
#include "../TA3D_NameSpace.h" | |
#include "../logs/logs.h" | |
--- src/install.cpp.old 2009-09-02 12:08:57.000000000 +0200 | |
+++ src/install.cpp 2012-08-08 18:45:01.000000000 +0200 | |
@@ -1,3 +1,4 @@ | |
+#include <cstdio> | |
#include "stdafx.h" | |
#include "TA3D_NameSpace.h" // our namespace, a MUST have. | |
#include "ta3dbase.h" | |
--- src/misc/string.cpp.old 2009-09-02 12:08:50.000000000 +0200 | |
+++ src/misc/string.cpp 2012-08-08 14:26:41.000000000 +0200 | |
@@ -1,6 +1,7 @@ | |
#include "../stdafx.h" | |
#include "string.h" | |
#include <allegro.h> | |
+#include <stdio.h> | |
#if TA3D_USE_BOOST == 1 | |
# include <boost/algorithm/string.hpp> | |
--- src/TA3D_NameSpace.cpp.old 2009-09-02 12:08:57.000000000 +0200 | |
+++ src/TA3D_NameSpace.cpp 2012-08-08 18:11:09.000000000 +0200 | |
@@ -15,6 +15,7 @@ | |
along with this program; if not, write to the Free Software | |
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA*/ | |
+#include <cstdio> | |
#include "stdafx.h" | |
#include "TA3D_NameSpace.h" | |
#if defined TA3D_PLATFORM_LINUX || defined TA3D_PLATFORM_DARWIN | |
--- src/TA3D_hpi.cpp | |
+++ src/TA3D_hpi.cpp | |
@@ -11,6 +11,7 @@ | |
#include "misc/resources.h" | |
#include <zlib.h> | |
+#include <cstdio> | |
#if defined TA3D_PLATFORM_WINDOWS | |
#pragma comment(lib, "tools/win32/mingw32/libs/zlib.lib") | |
#endif |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment