From ff216c21000ca13b1731f9b3493a567384339582 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 21 Jun 2011 10:07:59 +0000
Subject: [PATCH] Merged changeset 12581 from svn/trunk to address VisualStudio
 warning

---
 src/osg/glu/libtess/tess.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/osg/glu/libtess/tess.h b/src/osg/glu/libtess/tess.h
index 3bda56ab5..1d6052652 100644
--- a/src/osg/glu/libtess/tess.h
+++ b/src/osg/glu/libtess/tess.h
@@ -39,8 +39,11 @@
 #include <osg/GLU>
 
 #if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
-    // disable "structure was padded due to __declspec(align())
+    // disable: structure was padded due to __declspec(align())
     #pragma warning( disable : 4324 )
+
+    // disable: warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable
+    #pragma warning( disable :  4611)
 #endif
 
 #ifndef GLAPIENTRY