[Bf-blender-cvs] [e2b73c5bfdf] workspaces: Use DNA as a prefix

[Campbell Barton]

Commit: e2b73c5bfdf8bdecfdac181c58c59fd353124e42
Author: Campbell Barton
Date:   Tue May 2 08:33:23 2017 +1000
Branches: workspaces
https://developer.blender.org/rBe2b73c5bfdf8bdecfdac181c58c59fd353124e42

Use DNA as a prefix

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

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

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

diff --git a/source/blender/makesdna/dna_workspace_types.h b/source/blender/makesdna/dna_workspace_types.h
index d3de5cd320a..74541f439b1 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(NAMESPACE_DNA)
+#if !defined(NAMESPACE_WORKSPACE) && !defined(DNA_NAMESPACE)
 #  error "This file shouldn't be included outside of workspace namespace."
 #endif
 
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index f8e2fbefbab..50c4a71c4be 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -56,7 +56,8 @@
 
 #include "../blenlib/BLI_sys_types.h" // for intptr_t support
 
-#define NAMESPACE_DNA /* Allow including DNA files for specially guarded namespaces */
+/* Allow includinsg DNA files for specially guarded namespaces */
+#define DNA_NAMESPACE
 
 #define SDNA_MAX_FILENAME_LENGTH 255