[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15342] branches/blender2.5/blender: patch from skejoe for gcc 4.3 compatibility

Campbell Barton ideasman42 at gmail.com
Tue Jun 24 16:51:02 CEST 2008


Revision: 15342
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15342
Author:   campbellbarton
Date:     2008-06-24 16:51:02 +0200 (Tue, 24 Jun 2008)

Log Message:
-----------
patch from skejoe for gcc 4.3 compatibility

Modified Paths:
--------------
    branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/blender2.5/blender/intern/string/STR_String.h
    branches/blender2.5/blender/source/blender/editors/include/ED_screen.h
    branches/blender2.5/blender/source/blender/yafray/intern/export_File.cpp
    branches/blender2.5/blender/source/blender/yafray/intern/export_Plugin.cpp
    branches/blender2.5/blender/source/blender/yafray/intern/yafray_Render.cpp

Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2008-06-24 12:04:27 UTC (rev 15341)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2008-06-24 14:51:02 UTC (rev 15342)
@@ -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

Modified: branches/blender2.5/blender/intern/string/STR_String.h
===================================================================
--- branches/blender2.5/blender/intern/string/STR_String.h	2008-06-24 12:04:27 UTC (rev 15341)
+++ branches/blender2.5/blender/intern/string/STR_String.h	2008-06-24 14:51:02 UTC (rev 15342)
@@ -42,6 +42,8 @@
 #define	assertd(exp)			((void)NULL)
 #endif
 
+#include <cstdlib>
+#include <cstring>
 #include <vector>
 #include <limits.h>
 using namespace std;

Modified: branches/blender2.5/blender/source/blender/editors/include/ED_screen.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/ED_screen.h	2008-06-24 12:04:27 UTC (rev 15341)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_screen.h	2008-06-24 14:51:02 UTC (rev 15342)
@@ -63,8 +63,8 @@
 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 */

Modified: branches/blender2.5/blender/source/blender/yafray/intern/export_File.cpp
===================================================================
--- branches/blender2.5/blender/source/blender/yafray/intern/export_File.cpp	2008-06-24 12:04:27 UTC (rev 15341)
+++ branches/blender2.5/blender/source/blender/yafray/intern/export_File.cpp	2008-06-24 14:51:02 UTC (rev 15342)
@@ -1,6 +1,7 @@
 #include "export_File.h"
 
 #include <math.h>
+#include <cstring>
 
 using namespace std;
 

Modified: branches/blender2.5/blender/source/blender/yafray/intern/export_Plugin.cpp
===================================================================
--- branches/blender2.5/blender/source/blender/yafray/intern/export_Plugin.cpp	2008-06-24 12:04:27 UTC (rev 15341)
+++ branches/blender2.5/blender/source/blender/yafray/intern/export_Plugin.cpp	2008-06-24 14:51:02 UTC (rev 15342)
@@ -1,6 +1,7 @@
 #include "export_Plugin.h"
 
 #include <math.h>
+#include <cstring>
 using namespace std;
 
 

Modified: branches/blender2.5/blender/source/blender/yafray/intern/yafray_Render.cpp
===================================================================
--- branches/blender2.5/blender/source/blender/yafray/intern/yafray_Render.cpp	2008-06-24 12:04:27 UTC (rev 15341)
+++ branches/blender2.5/blender/source/blender/yafray/intern/yafray_Render.cpp	2008-06-24 14:51:02 UTC (rev 15342)
@@ -7,6 +7,7 @@
 #include "yafray_Render.h"
 
 #include <math.h>
+#include <cstring>
 
 using namespace std;
 





More information about the Bf-blender-cvs mailing list