From fdb0b003f0555cd865bc665eaf99137501aa2be2 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 24 Jun 2008 14:51:02 +0000
Subject: patch from skejoe for gcc 4.3 compatibility

---
 intern/ghost/intern/GHOST_WindowX11.cpp        | 2 ++
 intern/string/STR_String.h                     | 2 ++
 source/blender/editors/include/ED_screen.h     | 4 ++--
 source/blender/yafray/intern/export_File.cpp   | 1 +
 source/blender/yafray/intern/export_Plugin.cpp | 1 +
 source/blender/yafray/intern/yafray_Render.cpp | 1 +
 6 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index 4dce69a1051..faf6c5b2a99 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -35,6 +35,8 @@
 #include <X11/cursorfont.h>
 #include <X11/Xatom.h>
 
+#include <cstdio>
+
 #if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__)
 #include <strings.h>
 #endif
diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h
index 429b84e1531..2e489f91ae0 100644
--- a/intern/string/STR_String.h
+++ b/intern/string/STR_String.h
@@ -42,6 +42,8 @@
 #define	assertd(exp)			((void)NULL)
 #endif
 
+#include <cstdlib>
+#include <cstring>
 #include <vector>
 #include <limits.h>
 using namespace std;
diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index ac66e4420d9..f1ce0d5e66e 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -63,8 +63,8 @@ void	ED_operatortypes_screen(void);
 void	ED_keymap_screen(struct wmWindowManager *wm);
 
 /* operators; context poll callbacks */
-int		ED_operator_screenactive(bContext *C);
-int		ED_operator_screen_mainwinactive(bContext *C);
+int		ED_operator_screenactive(struct bContext *C);
+int		ED_operator_screen_mainwinactive(struct bContext *C);
 
 
 #endif /* ED_SCREEN_H */
diff --git a/source/blender/yafray/intern/export_File.cpp b/source/blender/yafray/intern/export_File.cpp
index 48e4f267177..40992513c8e 100644
--- a/source/blender/yafray/intern/export_File.cpp
+++ b/source/blender/yafray/intern/export_File.cpp
@@ -1,6 +1,7 @@
 #include "export_File.h"
 
 #include <math.h>
+#include <cstring>
 
 using namespace std;
 
diff --git a/source/blender/yafray/intern/export_Plugin.cpp b/source/blender/yafray/intern/export_Plugin.cpp
index cccd6b1ab8d..16ae2d97f62 100644
--- a/source/blender/yafray/intern/export_Plugin.cpp
+++ b/source/blender/yafray/intern/export_Plugin.cpp
@@ -1,6 +1,7 @@
 #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 fa7c61072f4..90229575235 100644
--- a/source/blender/yafray/intern/yafray_Render.cpp
+++ b/source/blender/yafray/intern/yafray_Render.cpp
@@ -7,6 +7,7 @@
 #include "yafray_Render.h"
 
 #include <math.h>
+#include <cstring>
 
 using namespace std;
 
-- 
cgit v1.2.3