[Bf-blender-cvs] [08d36367ed9] workspaces: Use DNA as a prefix, for workspace define too

[Campbell Barton]

Commit: 08d36367ed98f867bf2fd517d5cc71d426709295
Author: Campbell Barton
Date:   Tue May 2 08:35:11 2017 +1000
Branches: workspaces
https://developer.blender.org/rB08d36367ed98f867bf2fd517d5cc71d426709295

Use DNA as a prefix, for workspace define too

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

M	source/blender/blenkernel/intern/workspace.c
M	source/blender/makesdna/dna_workspace_types.h

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

diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c
index f687ab383a0..ed710c3f19a 100644
--- a/source/blender/blenkernel/intern/workspace.c
+++ b/source/blender/blenkernel/intern/workspace.c
@@ -22,7 +22,8 @@
  *  \ingroup bke
  */
 
-#define NAMESPACE_WORKSPACE /* allow including specially guarded dna_workspace_types.h */
+/* allow including specially guarded dna_workspace_types.h */
+#define DNA_NAMESPACE_WORKSPACE
 
 #include <stdlib.h>
 
diff --git a/source/blender/makesdna/dna_workspace_types.h b/source/blender/makesdna/dna_workspace_types.h
index 74541f439b1..cb46a155838 100644
--- a/source/blender/makesdna/dna_workspace_types.h
+++ b/source/blender/makesdna/dna_workspace_types.h
@@ -27,7 +27,7 @@
 #ifndef __DNA_WORKSPACE_TYPES_H__
 #define __DNA_WORKSPACE_TYPES_H__
 
-#if !defined(NAMESPACE_WORKSPACE) && !defined(DNA_NAMESPACE)
+#if !defined(DNA_NAMESPACE_WORKSPACE) && !defined(DNA_NAMESPACE)
 #  error "This file shouldn't be included outside of workspace namespace."
 #endif