Fix incorrect multiple inclusion guards

diff --git a/source/armature.h b/source/armature.h
index 1d01ff0a24a266991db839de4184a85475e1bc7e..68e3c6e82325a95d1c16ce0043ec943285f91413 100644 (file)
--- a/source/armature.h
+++ b/source/armature.h
@@ -1,5 +1,5 @@
-#ifndef ARMATURE_H_
-#define ARMATURE_H_
+#ifndef MSP_GL_ARMATURE_H_
+#define MSP_GL_ARMATURE_H_
 
 #include <list>
 #include <string>

diff --git a/source/colorcurve.h b/source/colorcurve.h
index f66ff976d7a0d06dc020980239b9adcf0676d008..d7589cb565b8bacd4f63c0f60d672b294ec7d9bf 100644 (file)
--- a/source/colorcurve.h
+++ b/source/colorcurve.h
@@ -1,5 +1,5 @@
-#ifndef COLORCURVE_H_
-#define COLORCURVE_H_
+#ifndef MSP_GL_COLORCURVE_H_
+#define MSP_GL_COLORCURVE_H_
 
 #include "postprocessor.h"
 #include "program.h"

diff --git a/source/cylinder.h b/source/cylinder.h
index ffc3cc2125d094f28332195104a9d40365aeb29c..dee4c4f5fbda1e4cbe44eb5293af69cf0536f329 100644 (file)
--- a/source/cylinder.h
+++ b/source/cylinder.h
@@ -1,5 +1,5 @@
-#ifndef CYLINDER_H_
-#define CYLINDER_H_
+#ifndef MSP_GL_CYLINDER_H_
+#define MSP_GL_CYLINDER_H_
 
 #include "geometrybuilder.h"
 

diff --git a/source/resourcewatcher.h b/source/resourcewatcher.h
index 60ffe5baddedd6fa6df56eb98c89a0a2555a01f4..1f5718ec23755775ba826ceb58cda2b902af16e0 100644 (file)
--- a/source/resourcewatcher.h
+++ b/source/resourcewatcher.h
@@ -1,5 +1,5 @@
-#ifndef RESOURCEWATCHER_H_
-#define RESOURCEWATCHER_H_
+#ifndef MSP_GL_RESOURCEWATCHER_H_
+#define MSP_GL_RESOURCEWATCHER_H_
 
 namespace Msp {
 namespace GL {

diff --git a/source/shadowmap.h b/source/shadowmap.h
index 57adf298fd27271bff0e8f4bb80ea2f916c7fba0..3757b1f190f0ef167f685ef4bc113182dc10b9d6 100644 (file)
--- a/source/shadowmap.h
+++ b/source/shadowmap.h
@@ -1,5 +1,5 @@
-#ifndef SHADOWMAP_H_
-#define SHADOWMAP_H_
+#ifndef MSP_GL_SHADOWMAP_H_
+#define MSP_GL_SHADOWMAP_H_
 
 #include "effect.h"
 #include "framebuffer.h"

diff --git a/source/technique.h b/source/technique.h
index 6841f486fd3fc3096e6884eb94621ef53c56e716..41157f0ae58e963bc817036f5802b74cd407f934 100644 (file)
--- a/source/technique.h
+++ b/source/technique.h
@@ -1,5 +1,5 @@
-#ifndef TECHNIQUE_H_
-#define TECHNIQUE_H_
+#ifndef MSP_GL_TECHNIQUE_H_
+#define MSP_GL_TECHNIQUE_H_
 
 #include "renderpass.h"
 #include "tag.h"

diff --git a/source/windingtest.h b/source/windingtest.h
index 7ef36942e9b5b24c019df3f1a3b92db313f3fa9f..ffc52556bfaa5e9b6df35c5345e1afb212fdacab 100644 (file)
--- a/source/windingtest.h
+++ b/source/windingtest.h
@@ -1,5 +1,5 @@
-#ifndef WINDINGTEST_H_
-#define WINDINGTEST_H_
+#ifndef MSP_GL_WINDINGTEST_H_
+#define MSP_GL_WINDINGTEST_H_
 
 #include <msp/strings/lexicalcast.h>
 #include "bindable.h"