two warning fixes

[simgear.git] / simgear / structure / OSGVersion.hxx

diff --git a/simgear/structure/OSGVersion.hxx b/simgear/structure/OSGVersion.hxx
index e8dd8e265dc21aa1322ff9f649d41da2ced6064b..46d0187e40dcaea746baa18589218ad123844752 100644 (file)
--- a/simgear/structure/OSGVersion.hxx
+++ b/simgear/structure/OSGVersion.hxx
@@ -23,4 +23,28 @@
 #define SG_OSG_VERSION \
     ((OPENSCENEGRAPH_MAJOR_VERSION*10000)\
      + (OPENSCENEGRAPH_MINOR_VERSION*1000) + OPENSCENEGRAPH_PATCH_VERSION)
+
+#define SG_OSG_VERSION_GREATER_EQUAL(MAJOR, MINOR, PATCH) \
+  ((OPENSCENEGRAPH_MAJOR_VERSION > (MAJOR)) ||            \
+   (OPENSCENEGRAPH_MAJOR_VERSION == (MAJOR) &&            \
+    (OPENSCENEGRAPH_MINOR_VERSION > (MINOR) ||            \
+     (OPENSCENEGRAPH_MINOR_VERSION == (MINOR) &&          \
+      OPENSCENEGRAPH_PATCH_VERSION >= (PATCH)))))
+
+#define SG_OSG_VERSION_GREATER_THAN(MAJOR, MINOR, PATCH)  \
+  ((OPENSCENEGRAPH_MAJOR_VERSION > (MAJOR)) ||            \
+   (OPENSCENEGRAPH_MAJOR_VERSION == (MAJOR) &&            \
+    (OPENSCENEGRAPH_MINOR_VERSION > (MINOR) ||            \
+     (OPENSCENEGRAPH_MINOR_VERSION == (MINOR) &&          \
+      OPENSCENEGRAPH_PATCH_VERSION > (PATCH)))))
+
+#define SG_OSG_VERSION_LESS_THAN(MAJOR, MINOR, PATCH)  \
+  (!SG_OSG_VERSION_GREATER_EQUAL(MAJOR, MINOR, PATCH))
+
+#define SG_OSG_VERSION_LESS_EQUAL(MAJOR, MINOR, PATCH)  \
+  (!SG_OSG_VERSION_GREATER_THAN(MAJOR, MINOR, PATCH))
+
+#define SG_OSG_MIN_VERSION_REQUIRED(MAJOR, MINOR, PATCH) \
+  SG_OSG_VERSION_GREATER_EQUAL(MAJOR, MINOR, PATCH)
+
 #endif