diff --git a/src/osgPlugins/dx/DXWriter.cpp b/src/osgPlugins/dx/DXWriter.cpp index 1bb5d63fd..13599844a 100644 --- a/src/osgPlugins/dx/DXWriter.cpp +++ b/src/osgPlugins/dx/DXWriter.cpp @@ -142,8 +142,10 @@ #if defined(WIN32) && !defined(__CYGWIN__) #define vsnprintf _vsnprintf +#define snprintf _snprintf #endif + namespace dx { //---------------------------------------------------------------------------- @@ -525,7 +527,7 @@ inline int WARNING( char fmt[], ... ) //---------------------------------------------------------------------------- void GetParms( int argc, char *argv[], - char infile [ PATH_MAX ], WriterParms &parms ) + char infile [ DX_PATH_MAX ], WriterParms &parms ) { WriterParms defaults; @@ -581,7 +583,7 @@ void GetParms( int argc, char *argv[], } infile[0] = parms.outfile[0] = '\0'; - strncat( infile , argv[ i ], PATH_MAX-1 ); + strncat( infile , argv[ i ], DX_PATH_MAX-1 ); strncat( parms.outfile, argv[i+1], sizeof(parms.outfile)-1 ); } @@ -2279,10 +2281,6 @@ void DXWriter::CollectUnhandledModesAndAttrs( osg::StateSet *sset ) //---------------------------------------------------------------------------- -#ifdef WIN32 -#define snprintf _snprintf -#endif - void DXWriter::ReportUnhandledModesAndAttrs() { char msg[1024]; diff --git a/src/osgPlugins/dx/DXWriter.h b/src/osgPlugins/dx/DXWriter.h index 90541e265..16f224481 100644 --- a/src/osgPlugins/dx/DXWriter.h +++ b/src/osgPlugins/dx/DXWriter.h @@ -21,11 +21,7 @@ #include #include -#ifdef WIN32 -// windows only defines PATH_MAX on _POSIX_ -#define PATH_MAX 512 -#endif - +const int DX_PATH_MAX = 512; namespace dx {