[Bf-blender-cvs] [a09609f21e7] workspaces: Minor changes only, use BKE prefix and remove nested header

[Campbell Barton]

Commit: a09609f21e79d9773b01357048653180218f1dd3
Author: Campbell Barton
Date:   Tue Apr 25 16:24:26 2017 +1000
Branches: workspaces
https://developer.blender.org/rBa09609f21e79d9773b01357048653180218f1dd3

Minor changes only, use BKE prefix and remove nested header

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

M	source/blender/blenkernel/BKE_workspace.h
M	source/blender/blenkernel/intern/library.c
M	source/blender/blenkernel/intern/workspace.c
M	source/blender/blenlib/BLI_string.h

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

diff --git a/source/blender/blenkernel/BKE_workspace.h b/source/blender/blenkernel/BKE_workspace.h
index a2f577ad006..52aa06aa97c 100644
--- a/source/blender/blenkernel/BKE_workspace.h
+++ b/source/blender/blenkernel/BKE_workspace.h
@@ -150,6 +150,6 @@ void BKE_workspace_relation_data_set(struct WorkSpaceDataRelation *relation, voi
 /* -------------------------------------------------------------------- */
 /* Don't use outside of BKE! */
 
-WorkSpace *workspace_alloc(void) ATTR_WARN_UNUSED_RESULT;
+WorkSpace *BKE_workspace_alloc(void) ATTR_WARN_UNUSED_RESULT;
 
 #endif /* __BKE_WORKSPACE_H__ */
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 144540db2dc..d9aa4d689d8 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -971,7 +971,7 @@ void *BKE_libblock_alloc_notest(short type)
 			id = MEM_callocN(sizeof(CacheFile), "Cache File");
 			break;
 		case ID_WS:
-			id = (ID *)workspace_alloc();
+			id = (ID *)BKE_workspace_alloc();
 			break;
 	}
 	return id;
diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c
index b0829f0213d..9edb0830dc5 100644
--- a/source/blender/blenkernel/intern/workspace.c
+++ b/source/blender/blenkernel/intern/workspace.c
@@ -26,9 +26,9 @@
 
 #include <stdlib.h>
 
+#include "BLI_utildefines.h"
 #include "BLI_string.h"
 #include "BLI_string_utils.h"
-#include "BLI_utildefines.h"
 #include "BLI_listbase.h"
 
 #include "BKE_global.h"
@@ -51,7 +51,7 @@
 /**
  * Only to be called by #BKE_libblock_alloc_notest! Always use BKE_workspace_add to add a new workspace.
  */
-WorkSpace *workspace_alloc(void)
+WorkSpace *BKE_workspace_alloc(void)
 {
 	return MEM_callocN(sizeof(WorkSpace), __func__);
 }
diff --git a/source/blender/blenlib/BLI_string.h b/source/blender/blenlib/BLI_string.h
index d7430648a5c..d137806c575 100644
--- a/source/blender/blenlib/BLI_string.h
+++ b/source/blender/blenlib/BLI_string.h
@@ -38,7 +38,6 @@
 extern "C" {
 #endif
 
-#include "BLI_utildefines.h"
 #include "BLI_compiler_attrs.h"
 
 char *BLI_strdupn(const char *str, const size_t len) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();