From 3fd9c6c1de2f86b96cc57844f5c4410aeba0ce05 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 13 Apr 2009 09:41:22 +0000 Subject: [PATCH] Replaced #idef WIN32 with _MSC_VER to try and fix build errors under mingw --- src/osgPlugins/ply/typedefs.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/osgPlugins/ply/typedefs.h b/src/osgPlugins/ply/typedefs.h index 320c8c886..abf27d8b3 100644 --- a/src/osgPlugins/ply/typedefs.h +++ b/src/osgPlugins/ply/typedefs.h @@ -12,13 +12,12 @@ #ifndef MESH_TYPEDEFS_H #define MESH_TYPEDEFS_H -# ifdef WIN32 +# if defined(_MSC_VER) # include # include # endif # include -# include #ifdef NDEBUG # define MESHASSERT( x ) @@ -31,7 +30,7 @@ # define MESHWARN osg::notify(osg::WARN) # define MESHINFO osg::notify(osg::INFO) -#ifdef WIN32 +#if defined(_MSC_VER) typedef int socklen_t; typedef UINT64 uint64_t; @@ -44,7 +43,7 @@ typedef UINT8 uint8_t; typedef SSIZE_T ssize_t; # endif -#endif // Win32 +#endif // defined(_MSC_VER) #include #include