From d5fa4dd272df0063c7fec5b2ac3b997af838ac9c Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 17 Jun 2011 05:57:29 +0000
Subject: [PATCH] Added disabling of VisualStudio warning C4324 : structure was
 padded due to __declspec(align())

---
 src/osg/glu/libtess/tess.h               | 4 ++++
 src/osgPlugins/jpeg/ReaderWriterJPEG.cpp | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/src/osg/glu/libtess/tess.h b/src/osg/glu/libtess/tess.h
index 7018a1a09..3bda56ab5 100644
--- a/src/osg/glu/libtess/tess.h
+++ b/src/osg/glu/libtess/tess.h
@@ -38,6 +38,10 @@
 // #include <GL/glu.h>
 #include <osg/GLU>
 
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
+    // disable "structure was padded due to __declspec(align())
+    #pragma warning( disable : 4324 )
+#endif
 
 #ifndef GLAPIENTRY
     #define GLAPIENTRY GL_APIENTRY 
diff --git a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
index d71b2547d..41d599d29 100644
--- a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
+++ b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
@@ -9,6 +9,11 @@
 
 #include <sstream>
 
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
+    // disable "structure was padded due to __declspec(align())
+    #pragma warning( disable : 4324 )
+#endif
+
 /****************************************************************************
  *
  * Follows is code extracted from the simage library.  Original Authors: