From 635993038a576d41525f3434f2fcca559190ee66 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 18 Jun 2013 14:52:26 +0000
Subject: [PATCH] Changed header guard back to original, and removed deprecated
 enum

---
 include/osg/Array    | 3 ---
 include/osg/Geometry | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/include/osg/Array b/include/osg/Array
index 702028c4d..d04759262 100644
--- a/include/osg/Array
+++ b/include/osg/Array
@@ -82,9 +82,6 @@ class OSG_EXPORT Array : public BufferData
             BIND_OFF=0,
             BIND_OVERALL=1,
             BIND_PER_PRIMITIVE_SET=2,
-#if defined(OSG_USE_DEPRECATED_GEOMETRY_METHODS)
-            BIND_PER_PRIMITIVE=3,
-#endif
             BIND_PER_VERTEX=4,
             BIND_INSTANCE_DIVISOR_0=6,
             BIND_INSTANCE_DIVISOR_1=BIND_INSTANCE_DIVISOR_0+1,
diff --git a/include/osg/Geometry b/include/osg/Geometry
index 662b3f9ae..3ee7d82e1 100644
--- a/include/osg/Geometry
+++ b/include/osg/Geometry
@@ -11,8 +11,8 @@
  * OpenSceneGraph Public License for more details.
 */
 
-#ifndef OSG_GEOMETRYNEW
-#define OSG_GEOMETRYNEW 1
+#ifndef OSG_GEOMETRY
+#define OSG_GEOMETRY 1
 
 #include <osg/Drawable>
 #include <osg/Vec2>