FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced #idef WIN32 with _MSC_VER to try and fix build errors under mingw

Browse Source
This commit is contained in:
Robert Osfield 2009-04-13 09:41:22 +00:00
parent 390be829af
commit 3fd9c6c1de
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osgPlugins/ply/typedefs.h
View File

@ -12,13 +12,12 @@
#ifndef MESH_TYPEDEFS_H #ifndef MESH_TYPEDEFS_H
#define MESH_TYPEDEFS_H #define MESH_TYPEDEFS_H
# ifdef WIN32 # if defined(_MSC_VER)
# include <Winsock2.h> # include <Winsock2.h>
# include <Windows.h> # include <Windows.h>
# endif # endif
# include <osg/Notify> # include <osg/Notify>
# include <cassert>
#ifdef NDEBUG #ifdef NDEBUG
# define MESHASSERT( x ) # define MESHASSERT( x )
@ -31,7 +30,7 @@
# define MESHWARN osg::notify(osg::WARN) # define MESHWARN osg::notify(osg::WARN)
# define MESHINFO osg::notify(osg::INFO) # define MESHINFO osg::notify(osg::INFO)
#ifdef WIN32 #if defined(_MSC_VER)
typedef int socklen_t; typedef int socklen_t;
typedef UINT64 uint64_t; typedef UINT64 uint64_t;
@ -44,7 +43,7 @@ typedef UINT8 uint8_t;
typedef SSIZE_T ssize_t; typedef SSIZE_T ssize_t;
# endif # endif
#endif // Win32 #endif // defined(_MSC_VER)
#include <exception> #include <exception>
#include <iostream> #include <iostream>