[Bf-blender-cvs] [b2c610c92e] workspaces: Fix error on some compiler configurations

Julian Eisel noreply at git.blender.org
Mon Jan 23 17:21:27 CET 2017


Commit: b2c610c92e79466f603f34e97875cd4876971dd2
Author: Julian Eisel
Date:   Mon Jan 23 17:10:58 2017 +0100
Branches: workspaces
https://developer.blender.org/rBb2c610c92e79466f603f34e97875cd4876971dd2

Fix error on some compiler configurations

Sergey was having compile errors here, I couldn't recreate them though. It actually seems weird that we have to include BLI_utildefines.h before BLI_listbase.h, since the latter one already includes the former. Don't want to bother much with such minor issues though, so let's just make all compilers happy ;)

Patch is by @sergey himself.

===================================================================

M	source/blender/blenkernel/intern/workspace.c
M	source/blender/editors/workspace/workspace_edit.c
M	source/blender/editors/workspace/workspace_layout_edit.c

===================================================================

diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c
index cfdb22dc98..da09e6d368 100644
--- a/source/blender/blenkernel/intern/workspace.c
+++ b/source/blender/blenkernel/intern/workspace.c
@@ -24,11 +24,13 @@
 
 #define NAMESPACE_WORKSPACE /* allow including specially guarded dna_workspace_types.h */
 
+#include <stdlib.h>
+
 #include "BLI_utildefines.h"
+#include "BLI_listbase.h"
 
 #include "BKE_global.h"
 #include "BKE_library.h"
-#include "BLI_listbase.h"
 #include "BKE_main.h"
 #include "BKE_screen.h"
 #include "BKE_workspace.h"
diff --git a/source/blender/editors/workspace/workspace_edit.c b/source/blender/editors/workspace/workspace_edit.c
index 64af6d7289..af5fbdd53a 100644
--- a/source/blender/editors/workspace/workspace_edit.c
+++ b/source/blender/editors/workspace/workspace_edit.c
@@ -22,12 +22,15 @@
  *  \ingroup edworkspace
  */
 
+#include <stdlib.h>
+
 #include "BKE_context.h"
 #include "BKE_main.h"
 #include "BKE_library.h"
 #include "BKE_screen.h"
 #include "BKE_workspace.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_listbase.h"
 
 #include "DNA_object_types.h"
diff --git a/source/blender/editors/workspace/workspace_layout_edit.c b/source/blender/editors/workspace/workspace_layout_edit.c
index 0dc178a187..b50dd9f2a0 100644
--- a/source/blender/editors/workspace/workspace_layout_edit.c
+++ b/source/blender/editors/workspace/workspace_layout_edit.c
@@ -22,14 +22,16 @@
  *  \ingroup edworkspace
  */
 
+#include <stdlib.h>
+
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_screen.h"
 #include "BKE_workspace.h"
 
-#include "BLI_listbase.h"
 #include "BLI_utildefines.h"
+#include "BLI_listbase.h"
 
 #include "DNA_screen_types.h"




More information about the Bf-blender-cvs mailing list