Prefix include guards with _MOVIT to avoid clashes with external files.

[movit] / padding_effect.h

diff --git a/padding_effect.h b/padding_effect.h
index 9e206ce89233f34fe43b6de6703a2cf4b4a83ae5..797db7e990eedf867ba17f3377e1a518c6c1de4d 100644 (file)
--- a/padding_effect.h
+++ b/padding_effect.h
@@ -1,5 +1,5 @@
-#ifndef _PADDING_EFFECT_H
-#define _PADDING_EFFECT_H 1
+#ifndef _MOVIT_PADDING_EFFECT_H
+#define _MOVIT_PADDING_EFFECT_H 1
 
 // Takes an image and pads it to fit a larger image, or crops it to fit a smaller one
 // (although the latter is implemented slightly less efficiently, and you cannot both
@@ -12,6 +12,9 @@
 // You may not change it after calling finalize(), since that could change the
 // graph (need_linear_light() etc. depend on the border color you choose).
 
+#include <GL/glew.h>
+#include <string>
+
 #include "effect.h"
 
 class PaddingEffect : public Effect {
@@ -36,4 +39,4 @@ private:
        float top, left;
 };
 
-#endif // !defined(_PADDING_EFFECT_H)
+#endif // !defined(_MOVIT_PADDING_EFFECT_H)