diff options
author | Kent Mein <mein@cs.umn.edu> | 2008-02-05 00:52:03 +0300 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2008-02-05 00:52:03 +0300 |
commit | fd7c729bd17d8c1d8e98003d27e47a58c1c258ec (patch) | |
tree | ae469f4c0351c6c8279afd8f19a97dacb6b83caf | |
parent | f11ea1eb8e51e9d2d236a4efb34e55b564eec7ba (diff) |
This is patch: [#8216] Make blender compile with gcc 4.3
minus one small include file that was commented out, I'm not
sure why it was commented out but I'm pretty sure its needed.
If there are still problems later we can sort it out, everything
else is pretty simple.
Kent
-rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.cpp | 2 | ||||
-rw-r--r-- | intern/string/STR_String.h | 4 | ||||
-rw-r--r-- | source/blender/yafray/intern/export_File.cpp | 2 | ||||
-rw-r--r-- | source/blender/yafray/intern/export_Plugin.cpp | 3 | ||||
-rw-r--r-- | source/blender/yafray/intern/yafray_Render.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp | 2 |
6 files changed, 15 insertions, 0 deletions
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 30fa30e59e6..0c999587d9b 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -42,6 +42,8 @@ #include <strings.h> #endif +#include <cstring> +#include <cstdio> // For obscure full screen mode stuuf // lifted verbatim from blut. diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h index 2da2b57c6f2..7b02e6c1855 100644 --- a/intern/string/STR_String.h +++ b/intern/string/STR_String.h @@ -47,6 +47,10 @@ #include <vector> #include <limits.h> + +#include <cstring> +#include <cstdlib> + using namespace std; diff --git a/source/blender/yafray/intern/export_File.cpp b/source/blender/yafray/intern/export_File.cpp index 73b30105b27..db84ed01ab9 100644 --- a/source/blender/yafray/intern/export_File.cpp +++ b/source/blender/yafray/intern/export_File.cpp @@ -2,6 +2,8 @@ #include <math.h> +#include <cstring> + using namespace std; static string command_path = ""; diff --git a/source/blender/yafray/intern/export_Plugin.cpp b/source/blender/yafray/intern/export_Plugin.cpp index c8d20180f8c..560294e2ffa 100644 --- a/source/blender/yafray/intern/export_Plugin.cpp +++ b/source/blender/yafray/intern/export_Plugin.cpp @@ -1,6 +1,9 @@ #include "export_Plugin.h" #include <math.h> + +#include <cstring> + using namespace std; diff --git a/source/blender/yafray/intern/yafray_Render.cpp b/source/blender/yafray/intern/yafray_Render.cpp index d9d421e0720..01da4683d71 100644 --- a/source/blender/yafray/intern/yafray_Render.cpp +++ b/source/blender/yafray/intern/yafray_Render.cpp @@ -8,6 +8,8 @@ #include <math.h> +#include <cstring> + using namespace std; void yafrayRender_t::clearAll() diff --git a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp index dbe875957b0..8bbac10f7ca 100644 --- a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp +++ b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp @@ -32,6 +32,8 @@ #include "GPC_KeyboardDevice.h" +#include <cstdlib> + /** * NextFrame toggles currentTable with previousTable, * and copies relevant event information from previous to current table |