diff --git a/src/osgPlugins/osgjs/JSON_Objects b/src/osgPlugins/osgjs/JSON_Objects index 351b58293..3977f6d3b 100644 --- a/src/osgPlugins/osgjs/JSON_Objects +++ b/src/osgPlugins/osgjs/JSON_Objects @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -18,21 +19,6 @@ #include "json_stream" -#ifdef WIN32 - #if defined(__MINGW32__) || (!defined(_MSC_VER) || _MSC_VER<1600) - typedef unsigned __int8 uint8_t; - typedef unsigned __int16 uint16_t; - typedef unsigned __int32 uint32_t; - typedef signed __int8 int8_t; - typedef signed __int16 int16_t; - typedef signed __int32 int32_t; - #else - #include - #endif -#else - #include -#endif - class WriteVisitor; struct Vec5 diff --git a/src/osgPlugins/stl/ReaderWriterSTL.cpp b/src/osgPlugins/stl/ReaderWriterSTL.cpp index 947f30072..b951609b6 100644 --- a/src/osgPlugins/stl/ReaderWriterSTL.cpp +++ b/src/osgPlugins/stl/ReaderWriterSTL.cpp @@ -25,6 +25,7 @@ #include #include +#include #include #include @@ -43,23 +44,6 @@ #include #include - - -#if defined(_WIN32) && !defined(__MINGW32__) && (!defined(_MSC_VER) || _MSC_VER<1600) - -typedef unsigned __int8 uint8_t; -typedef unsigned __int16 uint16_t; -typedef unsigned __int32 uint32_t; -typedef signed __int8 int8_t; -typedef signed __int16 int16_t; -typedef signed __int32 int32_t; - -#else - -#include - -#endif - #include struct STLOptionsStruct {