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 #include +#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 +#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: